diff --git a/pybis/src/python/CHANGELOG.md b/pybis/src/python/CHANGELOG.md index bdc9f5702035862ddd5d32173cbb9e901ff8d6dd..2f0abd9b62c0f900166306e048abc5978f6c8f06 100644 --- a/pybis/src/python/CHANGELOG.md +++ b/pybis/src/python/CHANGELOG.md @@ -1,3 +1,8 @@ +## Changes with pybis-1.9.3 + +* fixed documentation: add_members (not add_persons) +* bugfix role assignments of groups + ## Changes with pybis-1.9.2 * searches for datasets and samples are highly improved diff --git a/pybis/src/python/README.md b/pybis/src/python/README.md index 5a525c397433f583f80bd80189d97610a8ab7500..ef065b428f2ec16b9d9b00028f908a1a20cddc0e 100644 --- a/pybis/src/python/README.md +++ b/pybis/src/python/README.md @@ -126,9 +126,9 @@ group.assign_role(role='ADMIN', space='DEFAULT') group.get_roles() group.revoke_role(role='ADMIN', space='DEFAULT') -group.add_persons(['admin']) -group.get_persons() -group.del_persons(['admin']) +group.add_members(['admin']) +group.get_members() +group.del_members(['admin']) group.delete() o.get_persons() diff --git a/pybis/src/python/pybis/__init__.py b/pybis/src/python/pybis/__init__.py index b2c5fe70dd5b62fe2b565da8abc8041646f66371..c09faa979fdad428ea5009396b3390cdd526bfbe 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.9.2' +__version__ = '1.9.3' from . import pybis from .pybis import Openbis diff --git a/pybis/src/python/pybis/pybis.py b/pybis/src/python/pybis/pybis.py index e65ecd7eca255edbe58d63450597f013a1515285..d44a332a0219219e1c65b2ece10331a6a23e5e4c 100644 --- a/pybis/src/python/pybis/pybis.py +++ b/pybis/src/python/pybis/pybis.py @@ -1135,7 +1135,7 @@ class Openbis: else: groupId = search_args[attr].code sub_crit.append( - _subcriteria_for_permid(groupId, 'AuthorizationGroup') + _subcriteria_for_permid(groupId, 'authorizationGroup') ) elif attr == 'role': # TODO diff --git a/pybis/src/python/setup.py b/pybis/src/python/setup.py index b7f8b9853da7d66554103c7c93286cd344a3eb3d..d98d25fa4d55669e55272c2d728a0b6a57241c5c 100644 --- a/pybis/src/python/setup.py +++ b/pybis/src/python/setup.py @@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name='PyBIS', - version= '1.9.2', + version= '1.9.3', author='Swen Vermeul • ID SIS • ETH Zürich', author_email='swen@ethz.ch', description='openBIS connection and interaction, optimized for using with Jupyter', diff --git a/pybis/src/python/tests/conftest.py b/pybis/src/python/tests/conftest.py index 677de709a3f316e1eb0806ec0ed2cf7e95f4388c..1568409e701a0c6e37da8fcab45941ae1cf6d83a 100644 --- a/pybis/src/python/tests/conftest.py +++ b/pybis/src/python/tests/conftest.py @@ -3,9 +3,12 @@ import time from pybis import Openbis -openbis_url = 'https://localhost:8443' -admin_username = 'admin' -admin_password = 'changeit' +#openbis_url = 'https://localhost:8443' +#admin_username = 'admin' +#admin_password = 'changeit' +openbis_url = 'http://localhost:20000' +admin_username = 'openbis_test_js' +admin_password = 'password' @pytest.yield_fixture(scope="module") def openbis_instance(): diff --git a/pybis/src/python/tests/test_group.py b/pybis/src/python/tests/test_group.py index 9e3268332131fe216aa8479ba01bd9125e8807d1..cb3e8dad9fd2cb8b55de3e054437e8e837d6dfeb 100644 --- a/pybis/src/python/tests/test_group.py +++ b/pybis/src/python/tests/test_group.py @@ -27,12 +27,12 @@ def test_crud_group(openbis_instance, group): changed_description = 'changed description of group ' + group.code group.description = changed_description group.save() - group_changed = openbis_instance.get_group(code=group.code) + group_changed = openbis_instance.get_group(group.code) assert group_changed.description == changed_description group.delete('test') with pytest.raises(ValueError): - group_not_exists = openbis_instance.get_group(code=group.code) + group_not_exists = openbis_instance.get_group(group.code) assert group_not_exists is None