diff --git a/pybis/src/python/CHANGELOG.md b/pybis/src/python/CHANGELOG.md index a2aeb52b069e3917bb34c1af40fc675b8086b17b..8ad1b6e1b1169b64a4c3450371c386753b6b74c3 100644 --- a/pybis/src/python/CHANGELOG.md +++ b/pybis/src/python/CHANGELOG.md @@ -1,3 +1,7 @@ +## Changes with pybis-1.32.1 + +- fixing the issue with incorrectly named reference to DataSetKind.PHYSICAL + ## Changes with pybis-1.32.0 - throw error when invalid token is assigned diff --git a/pybis/src/python/pybis/__init__.py b/pybis/src/python/pybis/__init__.py index b1ad2c1edf6ceb4ced5016633528bf43ca3ee5e6..1b966b2dce92b183b8e998fd4d5586fb53f75174 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.32.0" +__version__ = "1.32.1" from . import pybis from .pybis import DataSet diff --git a/pybis/src/python/pybis/dataset.py b/pybis/src/python/pybis/dataset.py index df057ce229c512691220044dfc904515a983a707..9bcb253bbd49f80d2c18ede731586757dbe3f3e6 100644 --- a/pybis/src/python/pybis/dataset.py +++ b/pybis/src/python/pybis/dataset.py @@ -55,7 +55,7 @@ class DataSet( **kwargs, ): - if kind == "PHYSICAL_DATA": + if kind == "PHYSICAL": if files is None and zipfile is None: raise ValueError("please provide at least one file") @@ -96,7 +96,7 @@ class DataSet( if kind is not None: kind = kind.upper() - allowed_kinds = ["PHYSICAL_DATA", "CONTAINER", "LINK"] + allowed_kinds = ["PHYSICAL", "CONTAINER", "LINK"] if kind not in allowed_kinds: raise ValueError( "only these values are allowed for kind: {}".format(allowed_kinds) @@ -813,7 +813,7 @@ class DataSet( "A DataSet must be either connected to a Sample or an Experiment" ) - if self.kind == "PHYSICAL_DATA": + if self.kind == "PHYSICAL": if self.files is None or len(self.files) == 0: raise ValueError( "Cannot register a dataset without a file. Please provide at least one file" diff --git a/pybis/src/python/pybis/pybis.py b/pybis/src/python/pybis/pybis.py index 6106a95ad9fd3b9c0e00b6313d00708419046196..b92790073027c83715d17715c1fb551efcec5c48 100644 --- a/pybis/src/python/pybis/pybis.py +++ b/pybis/src/python/pybis/pybis.py @@ -2611,9 +2611,9 @@ class Openbis: if kind: kind = kind.upper() - if kind not in ["PHYSICAL_DATA", "CONTAINER", "LINK"]: + if kind not in ["PHYSICAL", "CONTAINER", "LINK"]: raise ValueError( - "unknown dataSet kind: {}. It should be one of the following: PHYSICAL_DATA, CONTAINER or LINK".format( + "unknown dataSet kind: {}. It should be one of the following: PHYSICAL, CONTAINER or LINK".format( kind ) ) @@ -4968,7 +4968,7 @@ class Openbis: def new_dataset( self, type=None, - kind="PHYSICAL_DATA", + kind="PHYSICAL", files=None, file=None, props=None, diff --git a/pybis/src/python/setup.py b/pybis/src/python/setup.py index 3ca7bdee3d5122725ea2f661013327aff9484ac7..7a4d25f48e6a98f22a8aad1bd868990a47de101c 100644 --- a/pybis/src/python/setup.py +++ b/pybis/src/python/setup.py @@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name="PyBIS", - version="1.32.0", + version="1.32.1", author="Swen Vermeul • ID SIS • ETH Zürich", author_email="swen@ethz.ch", description="openBIS connection and interaction, optimized for using with Jupyter",