Merge branch 'release/pybis-1.31.4'

pybis/src/python/CHANGELOG.md

+## Changes with pybis-1.31.4
+
+- fix another exception when saving a sample with custom code
+
 ## Changes with pybis-1.31.3
 
 - fix exception in sample.save

pybis/src/python/pybis/__init__.py

 name = "pybis"
 __author__ = "Swen Vermeul"
 __email__ = "swen@ethz.ch"
-__version__ = "1.31.3"
+__version__ = "1.31.4"
 
 from . import pybis
 from .pybis import DataSet

pybis/src/python/pybis/sample.py

@@ -231,8 +231,8 @@ class Sample(OpenBisObject, entity="sample", single_item_method_name="get_sample
                         "sampleCode": self.code,
                         "sampleType": self.type.code,
                         "sampleProperties": self.props(),
-                        "sampleParents": None,
-                        "sampleParentsNew": self.parents,
+                        "sampleParents": self.parents,
+                        "sampleParentsNew": None,
                         "sampleChildrenNew": self.children,
                         "sampleChildrenAdded": [],
                         "sampleChildrenRemoved": [],
@@ -255,7 +255,7 @@ class Sample(OpenBisObject, entity="sample", single_item_method_name="get_sample
                 try:
                     errmsg = resp["rows"][0][1]["value"]
                     errmsg = errmsg.split("\n")[0].split("UserFailureException: ")[1]
-                except KeyError:
+                except IndexError:
                     pass
                 raise ValueError(errmsg)
 

pybis/src/python/setup.py

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