diff --git a/pybis/src/python/CHANGELOG.md b/pybis/src/python/CHANGELOG.md index df802c94cf12a6cb948544b3eae951f15855b60d..ea16d783854679c4e63bf664c2085aff89b2a52e 100644 --- a/pybis/src/python/CHANGELOG.md +++ b/pybis/src/python/CHANGELOG.md @@ -1,3 +1,7 @@ +## Changes with pybis-1.14.6 + +- bugfix duplicate property-columns in get_samples() and get_datasets() + ## Changes with pybis-1.14.5 - no automagic detection of mountpoint, because of Windows incompatibilities diff --git a/pybis/src/python/pybis/__init__.py b/pybis/src/python/pybis/__init__.py index ce90449b678b3d213fa05c5391c2cb64b3713622..2e242739d67aa1f279bd29b27dea5e48abb392d0 100644 --- a/pybis/src/python/pybis/__init__.py +++ b/pybis/src/python/pybis/__init__.py @@ -1,7 +1,7 @@ name = 'pybis' __author__ = 'Swen Vermeul' __email__ = 'swen@ethz.ch' -__version__ = '1.14.5' +__version__ = '1.14.6' from . import pybis from .pybis import DataSet diff --git a/pybis/src/python/pybis/pybis.py b/pybis/src/python/pybis/pybis.py index fa556a865350ac5ad3760f27b8532e14fa2070ab..04b46a8b2ca28c0f7419cfc6d01e9953fb2bd73e 100644 --- a/pybis/src/python/pybis/pybis.py +++ b/pybis/src/python/pybis/pybis.py @@ -3558,11 +3558,9 @@ class Openbis: else: # property name is provided for i, dataSet in enumerate(response): - try: - datasets.loc[i, prop.upper()] = dataSet.get('properties',{}).get(prop,'') or dataSet.get('properties',{}).get(prop.upper(),'') - display_attrs.append(prop.upper()) - except AttributeError: - pass + val = dataSet.get('properties',{}).get(prop,'') or dataSet.get('properties',{}).get(prop.upper(),'') + datasets.loc[i, prop.upper()] = val + display_attrs.append(prop.upper()) return Things( @@ -3780,11 +3778,9 @@ class Openbis: else: # property name is provided for i, sample in enumerate(response): - try: - samples.loc[i, prop.upper()] = sample.get('properties',{}).get(prop,'') or sample.get('properties',{}).get(prop.upper(),'') - display_attrs.append(prop.upper()) - except AttributeError: - pass + val = sample.get('properties',{}).get(prop,'') or sample.get('properties',{}).get(prop.upper(),'') + samples.loc[i, prop.upper()] = val + display_attrs.append(prop.upper()) return Things( openbis_obj = self, diff --git a/pybis/src/python/setup.py b/pybis/src/python/setup.py index 62203feacef326dfb2ca2324a2144580a2fdcdcf..4e08a432a55fafddd07915ac26eddee6154027a5 100644 --- a/pybis/src/python/setup.py +++ b/pybis/src/python/setup.py @@ -10,7 +10,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name='PyBIS', - version= '1.14.5', + version= '1.14.6', author='Swen Vermeul • ID SIS • ETH Zürich', author_email='swen@ethz.ch', description='openBIS connection and interaction, optimized for using with Jupyter',