diff --git a/pybis/src/python/CHANGELOG.md b/pybis/src/python/CHANGELOG.md index d12e7004228f3228d4306a705f1523a5cfe8d76c..df802c94cf12a6cb948544b3eae951f15855b60d 100644 --- a/pybis/src/python/CHANGELOG.md +++ b/pybis/src/python/CHANGELOG.md @@ -1,3 +1,7 @@ +## Changes with pybis-1.14.5 + +- no automagic detection of mountpoint, because of Windows incompatibilities + ## Changes with pybis-1.14.4 - added new convenience methods: get_experiments, get_projects etc. diff --git a/pybis/src/python/pybis/__init__.py b/pybis/src/python/pybis/__init__.py index a54d5efbef115ca4f9ad9f6747a5f9286ba75f37..ce90449b678b3d213fa05c5391c2cb64b3713622 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.4' +__version__ = '1.14.5' from . import pybis from .pybis import DataSet diff --git a/pybis/src/python/pybis/pybis.py b/pybis/src/python/pybis/pybis.py index 9f304a31cf61fc79d2aa7cfaae0a302c35eb9156..fa556a865350ac5ad3760f27b8532e14fa2070ab 100644 --- a/pybis/src/python/pybis/pybis.py +++ b/pybis/src/python/pybis/pybis.py @@ -1008,10 +1008,12 @@ class Openbis: return os.path.ismount(mountpoint) - def get_mountpoint(self): + def get_mountpoint(self, search_mountpoint=False): """Returns the path to the active mountpoint. Returns None if no mountpoint is found or if the mountpoint is not mounted anymore. - Experimental: Tries to figure out an existing mountpoint for a given hostname. + + search_mountpoint=True: Tries to figure out an existing mountpoint for a given hostname + (experimental, does not work under Windows yet) """ mountpoint = getattr(self, 'mountpoint', None) @@ -1020,6 +1022,8 @@ class Openbis: return mountpoint else: return None + else: + if not search_mountpoint: return None # try to find out the mountpoint import subprocess diff --git a/pybis/src/python/setup.py b/pybis/src/python/setup.py index 33c3554717253cb5f9b8aa4fcf0e03a43584036a..62203feacef326dfb2ca2324a2144580a2fdcdcf 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.4', + version= '1.14.5', author='Swen Vermeul • ID SIS • ETH Zürich', author_email='swen@ethz.ch', description='openBIS connection and interaction, optimized for using with Jupyter',