Skip to content

Commit c097f24

Browse files
committed
Merge branch 'develop' into v4.0.0-rc-dev
2 parents 289698a + 1fe7003 commit c097f24

File tree

6 files changed

+4
-8
lines changed

6 files changed

+4
-8
lines changed

docs/reference/permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
::: synapseclient.models.permission.Permissions
1+
::: synapseclient.Permissions
22
options:
33
members:
44
- from_dict

synapseclient/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
from .team import Team, UserProfile, UserGroupHeader, TeamMember
3131
from .wiki import Wiki
32-
from synapseclient.models.permission import Permissions
32+
from .core.models.permission import Permissions
3333

3434
# ref = importlib.resources.files(__name__).joinpath("synapsePythonClient")
3535
# with ref.open("r") as fp:

synapseclient/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
from synapseclient.core.dozer import doze
120120

121121
from typing import Union, Dict, List, Optional, Tuple
122-
from synapseclient.models.permission import Permissions
122+
from synapseclient.core.models.permission import Permissions
123123
from opentelemetry import trace
124124

125125
tracer = trace.get_tracer("synapseclient")

synapseclient/models/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/unit/synapseclient/unit_test_get_permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import pytest
77

8-
from synapseclient.models import Permissions
8+
from synapseclient import Permissions
99
from synapseclient.entity import Entity
1010
from synapseclient.evaluation import Evaluation
1111
from typing import Dict

0 commit comments

Comments
 (0)