From 7b9b387a41d106f83fe6a7aa08ef1887a19e5e0b Mon Sep 17 00:00:00 2001
From: vermeul <swen@ethz.ch>
Date: Fri, 23 Mar 2018 16:21:52 +0100
Subject: [PATCH] updated README and version number (1.6)

---
 src/python/PyBis/README.md  | 16 +++++++++---
 src/python/PyBis/README.rst | 50 +++++++++++++++++++++++++++++++++++++
 src/python/PyBis/setup.py   |  2 +-
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/python/PyBis/README.md b/src/python/PyBis/README.md
index 94dc84333b6..34b4c698bd8 100644
--- a/src/python/PyBis/README.md
+++ b/src/python/PyBis/README.md
@@ -49,10 +49,18 @@ o.get_persons()
 person = o.new_person(userId='username')
 person.space = 'USER_SPACE'
 person.save()
-person.assign_role(role='ADMIN', space='DEFAULT')
-person.get_roles()
-person.revoke_role(role='ADMIN', space='DEFAULT')
 
+person.assign_role(role='ADMIN', space='MY_SPACE')
+person.assign_role(role='OBSERVER')
+person.get_roles()
+person.revoke_role(role='ADMIN', space='MY_SPACE')
+person.revoke_role(role='OBSERVER')
+
+o.get_role_assignments()
+o.get_role_assignments(space='MY_SPACE')
+o.get_role_assignments(group='MY_GROUP')
+ra = o.get_role_assignment(techId)
+ra.delete()
 ```
 
 
@@ -273,6 +281,8 @@ new_tag = o.new_tag('my_tag', description='some descriptive text')
 new_tag.save()
 o.get_tags()
 tag = o.get_tag('/username/TAG_Name')
+tag.description = 'some new description'
+tag.save()
 tag.get_experiments()
 tag.get_samples()
 tag.delete()
diff --git a/src/python/PyBis/README.rst b/src/python/PyBis/README.rst
index 276cada835f..fce8582e92f 100644
--- a/src/python/PyBis/README.rst
+++ b/src/python/PyBis/README.rst
@@ -38,6 +38,41 @@ Masterdata
     o.get_terms('MATING_TYPE')
     o.get_tags()
 
+Users, Groups and RoleAssignments
+---------------------------------
+
+::
+
+    o.get_groups()
+    group = o.new_group(code='group_name', description='...')
+    group = o.get_group('group_name')
+    group.save()
+    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.delete()
+
+    o.get_persons()
+    person = o.new_person(userId='username')
+    person.space = 'USER_SPACE'
+    person.save()
+
+    person.assign_role(role='ADMIN', space='MY_SPACE')
+    person.assign_role(role='OBSERVER')
+    person.get_roles()
+    person.revoke_role(role='ADMIN', space='MY_SPACE')
+    person.revoke_role(role='OBSERVER')
+
+    o.get_role_assignments()
+    o.get_role_assignments(space='MY_SPACE')
+    o.get_role_assignments(group='MY_GROUP')
+    ra = o.get_role_assignment(techId)
+    ra.delete()
+
 Spaces
 ------
 
@@ -260,6 +295,21 @@ Semantic Annotations
     # delete semantic annotation
     sa.delete('reason')
 
+Tags
+----
+
+::
+
+    new_tag = o.new_tag('my_tag', description='some descriptive text')
+    new_tag.save()
+    o.get_tags()
+    tag = o.get_tag('/username/TAG_Name')
+    tag.description = 'some new description'
+    tag.save()
+    tag.get_experiments()
+    tag.get_samples()
+    tag.delete()
+
 Requirements and organization
 =============================
 
diff --git a/src/python/PyBis/setup.py b/src/python/PyBis/setup.py
index 6ff878f5bc6..43389bb51e0 100644
--- a/src/python/PyBis/setup.py
+++ b/src/python/PyBis/setup.py
@@ -9,7 +9,7 @@ from setuptools import setup
 
 setup(
     name='PyBIS',
-    version= '1.5.0',
+    version= '1.6.0',
     description='openBIS connection and interaction, optimized for using with Jupyter',
     url='https://sissource.ethz.ch/sispub/pybis/',
     author='Swen Vermeul |  ID SIS | ETH Zürich',
-- 
GitLab