Merge branch 'release/1.7.6'

pybis/src/python/CHANGELOG.md

+## Changes with pybis-1.7.6
+
+* bugfix dataset upload for relative files (e.g. ../../file or /User/username/file)
+* always only the filename is added to the dataset, not the folder containing it
+* corrected License file
+
 ## Changes with pybis-1.7.5
 
 * added paging support for all search functions by providing start_with and count arguments

pybis/src/python/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2018] [ETH Zurich, Switzerland]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

pybis/src/python/pybis/__init__.py

 name = 'pybis'
 __author__ = 'Swen Vermeul'
 __email__ = 'swen@ethz.ch'
-__version__ = '1.7.5'
+__version__ = '1.7.6'
 
 from . import pybis
 from .pybis import Openbis

pybis/src/python/pybis/dataset.py

@@ -410,7 +410,7 @@ class DataSet(OpenBisObject):
                     "experimentIdentifier" : experiment_identifier,
                     "dataSetType" : dataset_type,
                     "folderName" : self.folder,
-                    "fileNames" : self.files,
+                    "fileNames" : self.files_in_wsp,
                     "isZipDirectoryUpload" : False,
                     "properties" : properties,
                     "parentIdentifiers": parentIds
@@ -519,11 +519,13 @@ class DataSet(OpenBisObject):
 
         # compose the upload-URL and put URL and filename in the upload queue 
         for filename in real_files:
-            file_in_wsp = os.path.join(folder, filename)
+            file_in_wsp = os.path.join(folder, os.path.basename(filename))
+            url_filename = os.path.join(folder, urllib.parse.quote(os.path.basename(filename)))
             self.files_in_wsp.append(file_in_wsp)
+
             upload_url = (
                 datastore_url + '/session_workspace_file_upload'
-                + '?filename=' + os.path.join(folder, urllib.parse.quote(filename))
+                + '?filename=' + url_filename
                 + '&id=1'
                 + '&startByte=0&endByte=0'
                 + '&sessionID=' + self.openbis.token

pybis/src/python/setup.py

@@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name='PyBIS',
-    version= '1.7.5',
+    version= '1.7.6',
     author='Swen Vermeul |  ID SIS | ETH Zürich',
     author_email='swen@ethz.ch',
     description='openBIS connection and interaction, optimized for using with Jupyter',