Merge branch 'master' of https://sissource.ethz.ch/sispub/openbis

api-openbis-python3-pybis/src/python/CHANGELOG.md

+## Changes with pybis-1.35.11
+
+- Improvements to dataset upload performance
+
 ## Changes with pybis-1.35.10
 
 - Fixed issue with changing properties for linked datasets 

api-openbis-python3-pybis/src/python/pybis/__init__.py

@@ -15,7 +15,7 @@
 name = "pybis"
 __author__ = "ID SIS • ETH Zürich"
 __email__ = "openbis-support@id.ethz.ch"
-__version__ = "1.35.10"
+__version__ = "1.35.11"
 
 from . import pybis
 from .pybis import DataSet

api-openbis-python3-pybis/src/python/pybis/dataset.py

@@ -1245,9 +1245,14 @@ class DataSetUploadQueue:
             file_size = os.path.getsize(filename)
 
             if self.multipart is True:
-                file = {filename: open(filename, "rb")}
-                resp = requests.post(upload_url, files=file, verify=verify_certificates)
-                resp.raise_for_status()
+                from requests_toolbelt.multipart.encoder import MultipartEncoder
+                with open(filename, "rb") as f:
+                    m = MultipartEncoder(
+                        fields={filename: (filename, f, 'application/octet-stream')})
+                    headers = {'Content-Type': m.content_type}
+                    r = requests.post(upload_url, data=m, headers=headers,
+                                      verify=verify_certificates)
+                    r.raise_for_status()
             else:
                 # upload the file to our DSS session workspace
                 with open(filename, "rb") as f:

api-openbis-python3-pybis/src/python/setup.cfg

 [metadata]
 name = PyBIS
-version = 1.35.10
+version = 1.35.11
 author = ID SIS • ETH Zürich
 author_email = openbis-support@id.ethz.ch
 license = Apache Software License Version 2.0

api-openbis-python3-pybis/src/python/setup.py

@@ -26,7 +26,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="PyBIS",
-    version="1.35.10",
+    version="1.35.11",
     author="ID SIS • ETH Zürich",
     author_email="openbis-support@id.ethz.ch",
     description="openBIS connection and interaction, optimized for using with Jupyter",

api-openbis-python3-pybis/src/python/tests/jenkinstest/test.py

@@ -27,7 +27,7 @@ class TestCase(testcase.TestCase):
         self.openbisController = self.createOpenbisController()
         self.openbisController.allUp()
         # run tests
-        util.executeCommand(['pytest', '--junitxml=test_results_pybis.xml',
+        util.executeCommand(['pytest', '--verbose', '--junitxml=test_results_pybis.xml',
                              'api-openbis-python3-pybis/src/python/tests'])
 
 

app-openbis-command-line/src/python/CHANGELOG.md

@@ -4,7 +4,7 @@
 * Added recursive search to object and data_set search commands
 * Updated documentation regarding authentication
 * Added dataset ids to sample search results
-* changed pybis dependency to version == 1.35.10
+* changed pybis dependency to version == 1.35.11
 
 # New in version 0.4.1
 

app-openbis-command-line/src/python/obis/__init__.py

@@ -14,6 +14,6 @@
 #
 __author__ = "ID SIS • ETH Zürich"
 __email__ = "openbis-support@id.ethz.ch"
-__version__ = "0.4.2rc5"
+__version__ = "0.4.2rc6"
 
 from .dm import *

app-openbis-command-line/src/python/setup.py

@@ -31,7 +31,7 @@ data_files = [
 
 setup(
     name="obis",
-    version="0.4.2rc5",
+    version="0.4.2rc6",
     description="Local data management with assistance from OpenBIS.",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -42,7 +42,7 @@ setup(
     packages=["obis", "obis.dm", "obis.dm.commands", "obis.scripts"],
     data_files=data_files,
     package_data={"obis": ["dm/git-annex-attributes"]},
-    install_requires=["pyOpenSSL", "pytest", "pybis==1.35.10", "click"],
+    install_requires=["pyOpenSSL", "pytest", "pybis==1.35.11", "click"],
     entry_points={"console_scripts": ["obis=obis.scripts.cli:main"]},
     zip_safe=False,
     python_requires=">=3.3",

docs/software-developer-documentation/apis/python-v3-api.md

@@ -1540,4 +1540,4 @@ pt.save()
 Currently, the value of the `custom_widget` key can be set to either
 
 - `Spreadsheet` (for tabular, Excel-like data)
-- `Word Processor` (for rich text data)
+- `Word Processor` (for rich text data)
\ No newline at end of file