Merge branch 'develop' into v4.0.0-rc-dev

Sage-Bionetworks · Jan 16, 2024 · c097f24 · c097f24
2 parents 289698a + 1fe7003
commit c097f24
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
diff --git a/docs/reference/permissions.md b/docs/reference/permissions.md
@@ -1,4 +1,4 @@
-::: synapseclient.models.permission.Permissions
+::: synapseclient.Permissions
     options:
         members:
         - from_dict

diff --git a/synapseclient/__init__.py b/synapseclient/__init__.py
@@ -29,7 +29,7 @@
 )
 from .team import Team, UserProfile, UserGroupHeader, TeamMember
 from .wiki import Wiki
-from synapseclient.models.permission import Permissions
+from .core.models.permission import Permissions
 
 # ref = importlib.resources.files(__name__).joinpath("synapsePythonClient")
 # with ref.open("r") as fp:

diff --git a/synapseclient/client.py b/synapseclient/client.py
@@ -119,7 +119,7 @@
 from synapseclient.core.dozer import doze
 
 from typing import Union, Dict, List, Optional, Tuple
-from synapseclient.models.permission import Permissions
+from synapseclient.core.models.permission import Permissions
 from opentelemetry import trace
 
 tracer = trace.get_tracer("synapseclient")

diff --git a/synapseclient/models/permission.py → synapseclient/core/models/permission.py b/synapseclient/models/permission.py → synapseclient/core/models/permission.py
diff --git a/synapseclient/models/__init__.py b/synapseclient/models/__init__.py
diff --git a/tests/unit/synapseclient/unit_test_get_permissions.py b/tests/unit/synapseclient/unit_test_get_permissions.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from synapseclient.models import Permissions
+from synapseclient import Permissions
 from synapseclient.entity import Entity
 from synapseclient.evaluation import Evaluation
 from typing import Dict