diff --git a/example/many_children.py b/example/many_children.py index d4eac7c..64a1554 100644 --- a/example/many_children.py +++ b/example/many_children.py @@ -1,12 +1,13 @@ -from typing import List -from specklepy.objects import Base -from specklepy.api import operations -from specklepy.transports.sqlite import SQLiteTransport +import os +import random +import string import time from pathlib import Path -import os -import string -import random +from typing import List + +from specklepy.api import operations +from specklepy.objects import Base +from specklepy.transports.sqlite import SQLiteTransport class Sub(Base): diff --git a/example/stream_objects.py b/example/stream_objects.py index 6fd0375..cc4ecb8 100644 --- a/example/stream_objects.py +++ b/example/stream_objects.py @@ -1,9 +1,10 @@ +import random +import string from typing import List + +from specklepy.api import operations from specklepy.api.wrapper import StreamWrapper from specklepy.objects import Base -from specklepy.api import operations -import string -import random class Sub(Base): diff --git a/example/using_speckle_base.py b/example/using_speckle_base.py index a8e73d9..753fbed 100644 --- a/example/using_speckle_base.py +++ b/example/using_speckle_base.py @@ -1,10 +1,11 @@ """This is an example showcasing the usage of speckle `Base` class.""" # the speckle.objects module exposes all speckle provided classes -from specklepy.objects import Base -from specklepy.api import operations from devtools import debug +from specklepy.api import operations +from specklepy.objects import Base + class ExampleSub(Base): """ diff --git a/pyproject.toml b/pyproject.toml index 1689895..7545297 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,3 +54,6 @@ target-version = ["py37", "py38", "py39", "py310"] [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" + +[tool.isort] +profile = "black" \ No newline at end of file diff --git a/src/specklepy/api/client.py b/src/specklepy/api/client.py index e81502a..d1b78ee 100644 --- a/src/specklepy/api/client.py +++ b/src/specklepy/api/client.py @@ -1,30 +1,28 @@ import re -from warnings import warn -from deprecated import deprecated -from specklepy.api.credentials import Account, get_account_from_token -from specklepy.logging import metrics -from specklepy.logging.exceptions import ( - SpeckleException, - SpeckleWarning, -) from typing import Dict +from warnings import warn -from specklepy.api import resources -from specklepy.api.resources import ( - branch, - commit, - stream, - object, - server, - user, - subscriptions, - other_user, - active_user -) +from deprecated import deprecated from gql import Client from gql.transport.requests import RequestsHTTPTransport from gql.transport.websockets import WebsocketsTransport +from specklepy.api import resources +from specklepy.api.credentials import Account, get_account_from_token +from specklepy.api.resources import ( + active_user, + branch, + commit, + object, + other_user, + server, + stream, + subscriptions, + user, +) +from specklepy.logging import metrics +from specklepy.logging.exceptions import SpeckleException, SpeckleWarning + class SpeckleClient: """ diff --git a/src/specklepy/api/credentials.py b/src/specklepy/api/credentials.py index 2a8ca87..d68a9a5 100644 --- a/src/specklepy/api/credentials.py +++ b/src/specklepy/api/credentials.py @@ -1,11 +1,13 @@ import os -from pydantic import BaseModel, Field # pylint: disable=no-name-in-module from typing import List, Optional -from specklepy.logging import metrics -from specklepy.api.models import ServerInfo -from specklepy.transports.sqlite import SQLiteTransport -from specklepy.logging.exceptions import SpeckleException + +from pydantic import BaseModel, Field # pylint: disable=no-name-in-module + from specklepy import paths +from specklepy.api.models import ServerInfo +from specklepy.logging import metrics +from specklepy.logging.exceptions import SpeckleException +from specklepy.transports.sqlite import SQLiteTransport class UserInfo(BaseModel): diff --git a/src/specklepy/api/host_applications.py b/src/specklepy/api/host_applications.py index 8851256..0a36283 100644 --- a/src/specklepy/api/host_applications.py +++ b/src/specklepy/api/host_applications.py @@ -1,5 +1,5 @@ -from enum import Enum from dataclasses import dataclass +from enum import Enum from unicodedata import name diff --git a/src/specklepy/api/models.py b/src/specklepy/api/models.py index 3f92b56..a5cc414 100644 --- a/src/specklepy/api/models.py +++ b/src/specklepy/api/models.py @@ -1,7 +1,6 @@ from datetime import datetime from typing import List, Optional - from pydantic import BaseModel, Field diff --git a/src/specklepy/api/operations.py b/src/specklepy/api/operations.py index cb778ca..722cd40 100644 --- a/src/specklepy/api/operations.py +++ b/src/specklepy/api/operations.py @@ -1,10 +1,11 @@ from typing import List, Optional + from specklepy.logging import metrics -from specklepy.objects.base import Base -from specklepy.transports.sqlite import SQLiteTransport from specklepy.logging.exceptions import SpeckleException -from specklepy.transports.abstract_transport import AbstractTransport +from specklepy.objects.base import Base from specklepy.serialization.base_object_serializer import BaseObjectSerializer +from specklepy.transports.abstract_transport import AbstractTransport +from specklepy.transports.sqlite import SQLiteTransport def send( diff --git a/src/specklepy/api/resource.py b/src/specklepy/api/resource.py index 83af7e6..fd1519b 100644 --- a/src/specklepy/api/resource.py +++ b/src/specklepy/api/resource.py @@ -1,15 +1,17 @@ -from graphql import DocumentNode -from specklepy.api.credentials import Account -from specklepy.transports.sqlite import SQLiteTransport from typing import Any, Dict, List, Optional, Tuple, Type, Union + from gql.client import Client from gql.transport.exceptions import TransportQueryError +from graphql import DocumentNode + +from specklepy.api.credentials import Account from specklepy.logging.exceptions import ( GraphQLException, SpeckleException, UnsupportedException, ) from specklepy.serialization.base_object_serializer import BaseObjectSerializer +from specklepy.transports.sqlite import SQLiteTransport class ResourceBase(object): diff --git a/src/specklepy/api/resources/__init__.py b/src/specklepy/api/resources/__init__.py index ad56df9..42512fa 100644 --- a/src/specklepy/api/resources/__init__.py +++ b/src/specklepy/api/resources/__init__.py @@ -1,8 +1,7 @@ -import sys import pkgutil +import sys from importlib import import_module - for (_, name, _) in pkgutil.iter_modules(__path__): imported_module = import_module("." + name, package=__name__) diff --git a/src/specklepy/api/resources/active_user.py b/src/specklepy/api/resources/active_user.py index 0eb017f..46fb6b7 100644 --- a/src/specklepy/api/resources/active_user.py +++ b/src/specklepy/api/resources/active_user.py @@ -1,11 +1,12 @@ -from typing import List, Optional from datetime import datetime, timezone +from typing import List, Optional + from gql import gql + +from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User +from specklepy.api.resource import ResourceBase from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException -from specklepy.api.resource import ResourceBase -from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User - NAME = "active_user" diff --git a/src/specklepy/api/resources/branch.py b/src/specklepy/api/resources/branch.py index dccb7cd..5e8aa10 100644 --- a/src/specklepy/api/resources/branch.py +++ b/src/specklepy/api/resources/branch.py @@ -1,6 +1,7 @@ from gql import gql -from specklepy.api.resource import ResourceBase + from specklepy.api.models import Branch +from specklepy.api.resource import ResourceBase from specklepy.logging import metrics NAME = "branch" diff --git a/src/specklepy/api/resources/commit.py b/src/specklepy/api/resources/commit.py index 7312de4..b3eed8f 100644 --- a/src/specklepy/api/resources/commit.py +++ b/src/specklepy/api/resources/commit.py @@ -1,9 +1,10 @@ -from typing import Optional, List -from gql import gql -from specklepy.api.resource import ResourceBase -from specklepy.api.models import Commit -from specklepy.logging import metrics +from typing import List, Optional +from gql import gql + +from specklepy.api.models import Commit +from specklepy.api.resource import ResourceBase +from specklepy.logging import metrics NAME = "commit" diff --git a/src/specklepy/api/resources/object.py b/src/specklepy/api/resources/object.py index 36c0675..dd80238 100644 --- a/src/specklepy/api/resources/object.py +++ b/src/specklepy/api/resources/object.py @@ -1,5 +1,7 @@ from typing import Dict, List + from gql import gql + from specklepy.api.resource import ResourceBase from specklepy.objects.base import Base diff --git a/src/specklepy/api/resources/other_user.py b/src/specklepy/api/resources/other_user.py index 7d5f313..8496c79 100644 --- a/src/specklepy/api/resources/other_user.py +++ b/src/specklepy/api/resources/other_user.py @@ -1,13 +1,12 @@ -from typing import List, Optional, Union from datetime import datetime, timezone +from typing import List, Optional, Union + from gql import gql + +from specklepy.api.models import ActivityCollection, LimitedUser +from specklepy.api.resource import ResourceBase from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException -from specklepy.api.resource import ResourceBase -from specklepy.api.models import ( - ActivityCollection, - LimitedUser, -) NAME = "other_user" diff --git a/src/specklepy/api/resources/server.py b/src/specklepy/api/resources/server.py index c8b42e0..c2d4163 100644 --- a/src/specklepy/api/resources/server.py +++ b/src/specklepy/api/resources/server.py @@ -1,12 +1,13 @@ import re from typing import Any, Dict, List, Tuple + from gql import gql + from specklepy.api.models import ServerInfo from specklepy.api.resource import ResourceBase from specklepy.logging import metrics from specklepy.logging.exceptions import GraphQLException - NAME = "server" diff --git a/src/specklepy/api/resources/stream.py b/src/specklepy/api/resources/stream.py index 921a6ec..a1306cf 100644 --- a/src/specklepy/api/resources/stream.py +++ b/src/specklepy/api/resources/stream.py @@ -1,12 +1,13 @@ from datetime import datetime, timezone from typing import List, Optional + from deprecated import deprecated from gql import gql -from specklepy.logging import metrics + from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, Stream from specklepy.api.resource import ResourceBase -from specklepy.logging.exceptions import UnsupportedException, SpeckleException - +from specklepy.logging import metrics +from specklepy.logging.exceptions import SpeckleException, UnsupportedException NAME = "stream" diff --git a/src/specklepy/api/resources/subscriptions.py b/src/specklepy/api/resources/subscriptions.py index db1fe94..8bdf021 100644 --- a/src/specklepy/api/resources/subscriptions.py +++ b/src/specklepy/api/resources/subscriptions.py @@ -1,7 +1,9 @@ -from typing import Callable, Dict, List, Union from functools import wraps +from typing import Callable, Dict, List, Union + from gql import gql from graphql import DocumentNode + from specklepy.api.resource import ResourceBase from specklepy.api.resources.stream import Stream from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/api/resources/user.py b/src/specklepy/api/resources/user.py index fd718e6..4e23417 100644 --- a/src/specklepy/api/resources/user.py +++ b/src/specklepy/api/resources/user.py @@ -1,12 +1,13 @@ -from typing import List, Optional, Union from datetime import datetime, timezone +from typing import List, Optional, Union + +from deprecated import deprecated from gql import gql + +from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User +from specklepy.api.resource import ResourceBase from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException -from specklepy.api.resource import ResourceBase -from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User -from deprecated import deprecated - NAME = "user" diff --git a/src/specklepy/api/wrapper.py b/src/specklepy/api/wrapper.py index 558118e..d6e3b01 100644 --- a/src/specklepy/api/wrapper.py +++ b/src/specklepy/api/wrapper.py @@ -1,14 +1,15 @@ +from urllib.parse import unquote, urlparse from warnings import warn -from urllib.parse import urlparse, unquote + +from specklepy.api.client import SpeckleClient from specklepy.api.credentials import ( Account, get_account_from_token, get_local_accounts, ) from specklepy.logging import metrics -from specklepy.api.client import SpeckleClient -from specklepy.transports.server.server import ServerTransport from specklepy.logging.exceptions import SpeckleException, SpeckleWarning +from specklepy.transports.server.server import ServerTransport class StreamWrapper: diff --git a/src/specklepy/logging/metrics.py b/src/specklepy/logging/metrics.py index ee095e9..fc197aa 100644 --- a/src/specklepy/logging/metrics.py +++ b/src/specklepy/logging/metrics.py @@ -1,14 +1,14 @@ -import sys -import queue -import hashlib -import getpass -import logging -from typing import Optional -import requests -import threading -import platform import contextlib +import getpass +import hashlib +import logging +import platform +import queue +import sys +import threading +from typing import Optional +import requests """ Anonymous telemetry to help us understand how to make a better Speckle. diff --git a/src/specklepy/objects/__init__.py b/src/specklepy/objects/__init__.py index d10fb2f..d83b8b4 100644 --- a/src/specklepy/objects/__init__.py +++ b/src/specklepy/objects/__init__.py @@ -1,6 +1,6 @@ """Builtin Speckle object kit.""" +from specklepy.objects import encoding, geometry, other, structural, units from specklepy.objects.base import Base -from specklepy.objects import encoding, geometry, other, units, structural __all__ = ["Base", "encoding", "geometry", "other", "units", "structural"] diff --git a/src/specklepy/objects/base.py b/src/specklepy/objects/base.py index 9bf61d7..2ec8814 100644 --- a/src/specklepy/objects/base.py +++ b/src/specklepy/objects/base.py @@ -1,21 +1,10 @@ -from typing import ( - Any, - ClassVar, - Dict, - List, - Optional, - Union, - Set, - Type, - get_type_hints, -) - import contextlib from enum import EnumMeta +from typing import Any, ClassVar, Dict, List, Optional, Set, Type, Union, get_type_hints from warnings import warn from specklepy.logging.exceptions import SpeckleException -from specklepy.objects.units import get_units_from_string, Units +from specklepy.objects.units import Units, get_units_from_string from specklepy.transports.memory import MemoryTransport PRIMITIVES = (int, float, str, bool) diff --git a/src/specklepy/objects/encoding.py b/src/specklepy/objects/encoding.py index c6b6361..c65915d 100644 --- a/src/specklepy/objects/encoding.py +++ b/src/specklepy/objects/encoding.py @@ -1,5 +1,5 @@ from enum import Enum -from typing import Any, Callable, List, Optional, Type, Dict +from typing import Any, Callable, Dict, List, Optional, Type from specklepy.logging.exceptions import SpeckleException from specklepy.objects.base import Base diff --git a/src/specklepy/objects/fakemesh.py b/src/specklepy/objects/fakemesh.py index c8ac5a7..413d4b1 100644 --- a/src/specklepy/objects/fakemesh.py +++ b/src/specklepy/objects/fakemesh.py @@ -1,5 +1,6 @@ from enum import Enum from typing import List, Optional + from specklepy.objects.geometry import Point from .base import Base diff --git a/src/specklepy/objects/other.py b/src/specklepy/objects/other.py index b184c3b..dab41a6 100644 --- a/src/specklepy/objects/other.py +++ b/src/specklepy/objects/other.py @@ -1,5 +1,7 @@ from typing import Any, List, Optional + from specklepy.objects.geometry import Point, Vector + from .base import Base OTHER = "Objects.Other." diff --git a/src/specklepy/objects/structural/__init__.py b/src/specklepy/objects/structural/__init__.py index 719819c..c7bdae9 100644 --- a/src/specklepy/objects/structural/__init__.py +++ b/src/specklepy/objects/structural/__init__.py @@ -8,73 +8,71 @@ from specklepy.objects.structural.analysis import ( ) from specklepy.objects.structural.axis import Axis from specklepy.objects.structural.geometry import ( + Element1D, + Element2D, + Element3D, ElementType1D, ElementType2D, ElementType3D, Node, Restraint, - Element1D, - Element2D, - Element3D, ) from specklepy.objects.structural.loading import ( - Load, - LoadType, ActionType, BeamLoadType, + CombinationType, FaceLoadType, + Load, + LoadAxisType, + LoadBeam, + LoadCase, + LoadCombinations, LoadDirection, LoadDirection2D, - LoadAxisType, - CombinationType, - LoadCase, - LoadBeam, - LoadCombinations, LoadFace, LoadGravity, LoadNode, + LoadType, ) from specklepy.objects.structural.material import ( - MaterialType, - StructuralMaterial, Concrete, + MaterialType, Steel, + StructuralMaterial, Timber, ) - from specklepy.objects.structural.properties import ( - MemberType, BaseReferencePoint, - ReferenceSurface, - PropertyType2D, - PropertyType3D, - ShapeType, - PropertyTypeSpring, - PropertyTypeDamper, + MemberType, Property, - SectionProfile, Property1D, Property2D, Property3D, PropertyDamper, PropertyMass, PropertySpring, + PropertyType2D, + PropertyType3D, + PropertyTypeDamper, + PropertyTypeSpring, + ReferenceSurface, ReferenceSurfaceEnum, + SectionProfile, + ShapeType, shapeType, ) - from specklepy.objects.structural.results import ( Result, Result1D, - ResultSet1D, Result2D, - ResultSet2D, Result3D, - ResultSet3D, ResultGlobal, - ResultSetNode, ResultNode, + ResultSet1D, + ResultSet2D, + ResultSet3D, ResultSetAll, + ResultSetNode, ) __all__ = [ diff --git a/src/specklepy/objects/structural/geometry.py b/src/specklepy/objects/structural/geometry.py index 70b2a64..1ff129d 100644 --- a/src/specklepy/objects/structural/geometry.py +++ b/src/specklepy/objects/structural/geometry.py @@ -3,6 +3,7 @@ from typing import List, Optional from specklepy.objects.base import Base from specklepy.objects.geometry import Line, Mesh, Plane, Point, Vector +from specklepy.objects.structural.axis import Axis from specklepy.objects.structural.properties import ( Property1D, Property2D, @@ -11,7 +12,6 @@ from specklepy.objects.structural.properties import ( PropertyMass, PropertySpring, ) -from specklepy.objects.structural.axis import Axis STRUCTURAL_GEOMETRY = "Objects.Structural.Geometry" diff --git a/src/specklepy/objects/structural/material.py b/src/specklepy/objects/structural/material.py index e7fc521..a18e8d1 100644 --- a/src/specklepy/objects/structural/material.py +++ b/src/specklepy/objects/structural/material.py @@ -3,7 +3,6 @@ from typing import Optional from specklepy.objects.base import Base - STRUCTURAL_MATERIALS = "Objects.Structural.Materials" diff --git a/src/specklepy/objects/structural/properties.py b/src/specklepy/objects/structural/properties.py index 4eab229..803bf65 100644 --- a/src/specklepy/objects/structural/properties.py +++ b/src/specklepy/objects/structural/properties.py @@ -2,9 +2,8 @@ from enum import Enum from typing import Optional from specklepy.objects.base import Base -from specklepy.objects.structural.material import StructuralMaterial from specklepy.objects.structural.axis import Axis - +from specklepy.objects.structural.material import StructuralMaterial STRUCTURAL_PROPERTY = "Objectives.Structural.Properties" diff --git a/src/specklepy/objects/units.py b/src/specklepy/objects/units.py index f1036c4..e89dbc7 100644 --- a/src/specklepy/objects/units.py +++ b/src/specklepy/objects/units.py @@ -1,7 +1,7 @@ -from typing import Union -from specklepy.logging.exceptions import SpeckleException, SpeckleInvalidUnitException from enum import Enum +from typing import Union +from specklepy.logging.exceptions import SpeckleException, SpeckleInvalidUnitException __all__ = [ "Units", diff --git a/src/specklepy/paths.py b/src/specklepy/paths.py index 24f736c..d32385b 100644 --- a/src/specklepy/paths.py +++ b/src/specklepy/paths.py @@ -1,5 +1,6 @@ import sys from pathlib import Path + from appdirs import user_data_dir diff --git a/src/specklepy/serialization/base_object_serializer.py b/src/specklepy/serialization/base_object_serializer.py index d11faba..7d4f154 100644 --- a/src/specklepy/serialization/base_object_serializer.py +++ b/src/specklepy/serialization/base_object_serializer.py @@ -1,21 +1,19 @@ -import re -import ujson import hashlib +import re import warnings -from uuid import uuid4 from enum import Enum -from warnings import warn from typing import Any, Dict, List, Tuple -from specklepy.objects.base import Base, DataChunk -from specklepy.logging.exceptions import ( - SpeckleException, - SpeckleWarning, -) -from specklepy.transports.abstract_transport import AbstractTransport +from uuid import uuid4 +from warnings import warn + +import ujson # import for serialization import specklepy.objects.geometry import specklepy.objects.other +from specklepy.logging.exceptions import SpeckleException, SpeckleWarning +from specklepy.objects.base import Base, DataChunk +from specklepy.transports.abstract_transport import AbstractTransport PRIMITIVES = (int, float, str, bool) diff --git a/src/specklepy/transports/abstract_transport.py b/src/specklepy/transports/abstract_transport.py index b0e2277..3235557 100644 --- a/src/specklepy/transports/abstract_transport.py +++ b/src/specklepy/transports/abstract_transport.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod -from typing import Optional, List, Dict +from typing import Dict, List, Optional + from pydantic import BaseModel from pydantic.config import Extra diff --git a/src/specklepy/transports/memory.py b/src/specklepy/transports/memory.py index 0f61bff..530dd5b 100644 --- a/src/specklepy/transports/memory.py +++ b/src/specklepy/transports/memory.py @@ -1,4 +1,5 @@ -from typing import Any, List, Dict +from typing import Any, Dict, List + from specklepy.transports.abstract_transport import AbstractTransport diff --git a/src/specklepy/transports/server/batch_sender.py b/src/specklepy/transports/server/batch_sender.py index f25aaf5..55c7f2a 100644 --- a/src/specklepy/transports/server/batch_sender.py +++ b/src/specklepy/transports/server/batch_sender.py @@ -1,10 +1,11 @@ +import gzip import json import logging -import threading import queue -import gzip +import threading import requests + from specklepy.logging.exceptions import SpeckleException LOG = logging.getLogger(__name__) diff --git a/src/specklepy/transports/server/server.py b/src/specklepy/transports/server/server.py index 56ac4a3..805799f 100644 --- a/src/specklepy/transports/server/server.py +++ b/src/specklepy/transports/server/server.py @@ -1,8 +1,8 @@ import json -import requests +from typing import Any, Dict, List from warnings import warn -from typing import Any, Dict, List +import requests from specklepy.api.client import SpeckleClient from specklepy.api.credentials import Account, get_account_from_token diff --git a/src/specklepy/transports/sqlite.py b/src/specklepy/transports/sqlite.py index b62da42..d79b526 100644 --- a/src/specklepy/transports/sqlite.py +++ b/src/specklepy/transports/sqlite.py @@ -1,10 +1,11 @@ import os import sqlite3 -from typing import Any, List, Dict, Optional, Tuple from contextlib import closing -from specklepy.transports.abstract_transport import AbstractTransport +from typing import Any, Dict, List, Optional, Tuple + from specklepy.logging.exceptions import SpeckleException from specklepy.paths import base_path +from specklepy.transports.abstract_transport import AbstractTransport class SQLiteTransport(AbstractTransport): diff --git a/tests/conftest.py b/tests/conftest.py index 3dbfe01..f0c3ba0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,13 +1,15 @@ -import uuid import random +import uuid + import pytest import requests -from specklepy.api.models import Stream + from specklepy.api.client import SpeckleClient -from specklepy.objects.base import Base -from specklepy.objects.geometry import Point -from specklepy.objects.fakemesh import FakeDirection, FakeMesh +from specklepy.api.models import Stream from specklepy.logging import metrics +from specklepy.objects.base import Base +from specklepy.objects.fakemesh import FakeDirection, FakeMesh +from specklepy.objects.geometry import Point metrics.disable() diff --git a/tests/test_active_user.py b/tests/test_active_user.py index b027025..8f3ff3f 100644 --- a/tests/test_active_user.py +++ b/tests/test_active_user.py @@ -1,4 +1,5 @@ import pytest + from specklepy.api.client import SpeckleClient from specklepy.api.models import Activity, ActivityCollection, User from specklepy.logging.exceptions import SpeckleException diff --git a/tests/test_base.py b/tests/test_base.py index b8360f7..5c27aa2 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -1,8 +1,9 @@ +from contextlib import ExitStack as does_not_raise from enum import Enum from typing import Dict, List, Optional, Union -from contextlib import ExitStack as does_not_raise import pytest + from specklepy.api import operations from specklepy.logging.exceptions import SpeckleException, SpeckleInvalidUnitException from specklepy.objects.base import Base diff --git a/tests/test_branch.py b/tests/test_branch.py index 46ddf36..27bf8ba 100644 --- a/tests/test_branch.py +++ b/tests/test_branch.py @@ -1,7 +1,8 @@ import pytest + from specklepy.api import operations -from specklepy.transports.server import ServerTransport from specklepy.api.models import Branch, Commit, Stream +from specklepy.transports.server import ServerTransport class TestBranch: diff --git a/tests/test_client_and_ops.py b/tests/test_client_and_ops.py index ed47a6f..a534a5d 100644 --- a/tests/test_client_and_ops.py +++ b/tests/test_client_and_ops.py @@ -1,10 +1,11 @@ import pytest + from specklepy.api import operations from specklepy.api.client import SpeckleClient -from specklepy.objects.base import Base -from specklepy.transports.server import ServerTransport from specklepy.api.credentials import Account, get_account_from_token from specklepy.logging.exceptions import SpeckleException, SpeckleWarning +from specklepy.objects.base import Base +from specklepy.transports.server import ServerTransport def test_invalid_authentication(): diff --git a/tests/test_commit.py b/tests/test_commit.py index 0443315..f9347e2 100644 --- a/tests/test_commit.py +++ b/tests/test_commit.py @@ -1,4 +1,5 @@ import pytest + from specklepy.api import operations from specklepy.api.models import Commit, Stream from specklepy.transports.server.server import ServerTransport diff --git a/tests/test_geometry.py b/tests/test_geometry.py index 8d14959..9c63cfd 100644 --- a/tests/test_geometry.py +++ b/tests/test_geometry.py @@ -2,10 +2,10 @@ import json import pytest + from specklepy.api import operations from specklepy.logging.exceptions import SpeckleException from specklepy.objects.base import Base -from specklepy.objects.units import Units from specklepy.objects.encoding import CurveArray, ObjectArray from specklepy.objects.geometry import ( Arc, @@ -30,6 +30,7 @@ from specklepy.objects.geometry import ( Surface, Vector, ) +from specklepy.objects.units import Units from specklepy.transports.memory import MemoryTransport diff --git a/tests/test_host_applications.py b/tests/test_host_applications.py index 0834c5b..de65bd3 100644 --- a/tests/test_host_applications.py +++ b/tests/test_host_applications.py @@ -1,7 +1,8 @@ import pytest + from specklepy.api.host_applications import ( - get_host_app_from_string, _app_name_host_app_mapping, + get_host_app_from_string, ) diff --git a/tests/test_objects.py b/tests/test_objects.py index 1018b71..f921ee6 100644 --- a/tests/test_objects.py +++ b/tests/test_objects.py @@ -1,4 +1,5 @@ import pytest + from specklepy.api.models import Stream from specklepy.objects import Base from specklepy.objects.encoding import ObjectArray diff --git a/tests/test_other_user.py b/tests/test_other_user.py index 92b0e83..bd17147 100644 --- a/tests/test_other_user.py +++ b/tests/test_other_user.py @@ -1,4 +1,5 @@ import pytest + from specklepy.api.client import SpeckleClient from specklepy.api.models import Activity, ActivityCollection, LimitedUser from specklepy.logging.exceptions import SpeckleException diff --git a/tests/test_registering_base.py b/tests/test_registering_base.py index 5f5a8b7..b3f3055 100644 --- a/tests/test_registering_base.py +++ b/tests/test_registering_base.py @@ -1,5 +1,7 @@ from typing import Type + import pytest + from specklepy.objects.base import Base from specklepy.objects.structural import Concrete diff --git a/tests/test_serialization.py b/tests/test_serialization.py index 5397b69..474bc70 100644 --- a/tests/test_serialization.py +++ b/tests/test_serialization.py @@ -1,12 +1,14 @@ import json + import pytest + from specklepy.api import operations -from specklepy.transports.server import ServerTransport -from specklepy.transports.memory import MemoryTransport -from specklepy.serialization.base_object_serializer import BaseObjectSerializer from specklepy.objects import Base -from specklepy.objects.geometry import Point from specklepy.objects.fakemesh import FakeMesh +from specklepy.objects.geometry import Point +from specklepy.serialization.base_object_serializer import BaseObjectSerializer +from specklepy.transports.memory import MemoryTransport +from specklepy.transports.server import ServerTransport @pytest.mark.run(order=5) diff --git a/tests/test_server.py b/tests/test_server.py index 5e0707c..884ef33 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -1,6 +1,7 @@ import pytest -from specklepy.api.models import ServerInfo + from specklepy.api.client import SpeckleClient +from specklepy.api.models import ServerInfo class TestServer: diff --git a/tests/test_stream.py b/tests/test_stream.py index 465072f..3111a6b 100644 --- a/tests/test_stream.py +++ b/tests/test_stream.py @@ -1,13 +1,15 @@ -import pytest from datetime import datetime + +import pytest + +from specklepy.api.client import SpeckleClient from specklepy.api.models import ( - ActivityCollection, Activity, + ActivityCollection, PendingStreamCollaborator, Stream, User, ) -from specklepy.api.client import SpeckleClient from specklepy.logging.exceptions import ( GraphQLException, SpeckleException, diff --git a/tests/test_structural.py b/tests/test_structural.py index b899d59..95ea1b0 100644 --- a/tests/test_structural.py +++ b/tests/test_structural.py @@ -1,31 +1,24 @@ import pytest -from specklepy.objects.geometry import ( - Line, - Mesh, - Point, - Vector, -) + +from specklepy.objects.geometry import Line, Mesh, Point, Vector +from specklepy.objects.structural.analysis import Model from specklepy.objects.structural.geometry import ( - Node, Element1D, Element2D, - Restraint, ElementType1D, ElementType2D, + Node, + Restraint, ) +from specklepy.objects.structural.loading import LoadGravity +from specklepy.objects.structural.material import StructuralMaterial from specklepy.objects.structural.properties import ( + MemberType, Property1D, Property2D, SectionProfile, - MemberType, ShapeType, ) -from specklepy.objects.structural.material import ( - StructuralMaterial, -) -from specklepy.objects.structural.analysis import Model - -from specklepy.objects.structural.loading import LoadGravity @pytest.fixture() diff --git a/tests/test_transforms.py b/tests/test_transforms.py index e276224..2e8c878 100644 --- a/tests/test_transforms.py +++ b/tests/test_transforms.py @@ -1,12 +1,14 @@ from typing import List + import pytest + from specklepy.api import operations from specklepy.objects.geometry import Point, Vector from specklepy.objects.other import ( - Transform, - BlockInstance, - BlockDefinition, IDENTITY_TRANSFORM, + BlockDefinition, + BlockInstance, + Transform, ) diff --git a/tests/test_user.py b/tests/test_user.py index 98a8430..7128309 100644 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -1,4 +1,5 @@ import pytest + from specklepy.api.client import SpeckleClient from specklepy.api.models import Activity, ActivityCollection, User from specklepy.logging.exceptions import SpeckleException diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index a818f3c..5099110 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -1,10 +1,12 @@ import json -from specklepy.api.wrapper import StreamWrapper -from specklepy.transports.sqlite import SQLiteTransport -from specklepy.paths import accounts_path from pathlib import Path + import pytest +from specklepy.api.wrapper import StreamWrapper +from specklepy.paths import accounts_path +from specklepy.transports.sqlite import SQLiteTransport + def test_parse_stream(): wrap = StreamWrapper("https://testing.speckle.dev/streams/a75ab4f10f")