Merge tag '1.8.0' into develop

better support for entity-types

pybis/src/python/CHANGELOG.md

+## Changes with pybis-1.8.0
+
+* better support for fetching entity-types (dataSetTypes, sampleTypes)
+* separation of propertyAssignments from entity-types
+* added .get_propertyAssignments() method to all entity-types
+
 ## Changes with pybis-1.7.6
 
 * bugfix dataset upload for relative files (e.g. ../../file or /User/username/file)

pybis/src/python/README.md

@@ -19,12 +19,22 @@ o.logout()
 ## Masterdata
 ```
 o.get_experiment_types()
+et = o.get_experiment_type('TEST')
+et.get_propertyAssignments()
+
 o.get_sample_types()
-o.get_sample_type('YEAST')
+st = o.get_sample_type('YEAST')
+et.get_propertyAssignments()
+
 o.get_material_types()
+mt = o.get_material_type('GENE')
+mt.get_propertyAssignments()
+
 o.get_dataset_types()
-o.get_dataset_types()[0]
-o.get_dataset_type('RAW_DATA')
+dst = o.get_dataset_types()[0]
+dst = o.get_dataset_type('RAW_DATA')
+dst.get_propertyAssignments()
+
 o.get_vocabularies()
 o.get_vocabulary('BACTERIAL_ANTIBIOTIC_RESISTANCE')
 o.get_terms(vocabulary='STORAGE')

pybis/src/python/pybis/__init__.py

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

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.6',
+    version= '1.8.0',
     author='Swen Vermeul |  ID SIS | ETH Zürich',
     author_email='swen@ethz.ch',
     description='openBIS connection and interaction, optimized for using with Jupyter',