diff --git a/poetry.lock b/poetry.lock index 2e95fb9..d40e0d2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -123,33 +123,33 @@ files = [ [[package]] name = "black" -version = "24.3.0" +version = "24.10.0" description = "The uncompromising code formatter." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "black-24.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7d5e026f8da0322b5662fa7a8e752b3fa2dac1c1cbc213c3d7ff9bdd0ab12395"}, - {file = "black-24.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9f50ea1132e2189d8dff0115ab75b65590a3e97de1e143795adb4ce317934995"}, - {file = "black-24.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2af80566f43c85f5797365077fb64a393861a3730bd110971ab7a0c94e873e7"}, - {file = "black-24.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:4be5bb28e090456adfc1255e03967fb67ca846a03be7aadf6249096100ee32d0"}, - {file = "black-24.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4f1373a7808a8f135b774039f61d59e4be7eb56b2513d3d2f02a8b9365b8a8a9"}, - {file = "black-24.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aadf7a02d947936ee418777e0247ea114f78aff0d0959461057cae8a04f20597"}, - {file = "black-24.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c02e4ea2ae09d16314d30912a58ada9a5c4fdfedf9512d23326128ac08ac3d"}, - {file = "black-24.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:bf21b7b230718a5f08bd32d5e4f1db7fc8788345c8aea1d155fc17852b3410f5"}, - {file = "black-24.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:2818cf72dfd5d289e48f37ccfa08b460bf469e67fb7c4abb07edc2e9f16fb63f"}, - {file = "black-24.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4acf672def7eb1725f41f38bf6bf425c8237248bb0804faa3965c036f7672d11"}, - {file = "black-24.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c7ed6668cbbfcd231fa0dc1b137d3e40c04c7f786e626b405c62bcd5db5857e4"}, - {file = "black-24.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:56f52cfbd3dabe2798d76dbdd299faa046a901041faf2cf33288bc4e6dae57b5"}, - {file = "black-24.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:79dcf34b33e38ed1b17434693763301d7ccbd1c5860674a8f871bd15139e7837"}, - {file = "black-24.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e19cb1c6365fd6dc38a6eae2dcb691d7d83935c10215aef8e6c38edee3f77abd"}, - {file = "black-24.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65b76c275e4c1c5ce6e9870911384bff5ca31ab63d19c76811cb1fb162678213"}, - {file = "black-24.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b5991d523eee14756f3c8d5df5231550ae8993e2286b8014e2fdea7156ed0959"}, - {file = "black-24.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c45f8dff244b3c431b36e3224b6be4a127c6aca780853574c00faf99258041eb"}, - {file = "black-24.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6905238a754ceb7788a73f02b45637d820b2f5478b20fec82ea865e4f5d4d9f7"}, - {file = "black-24.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7de8d330763c66663661a1ffd432274a2f92f07feeddd89ffd085b5744f85e7"}, - {file = "black-24.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:7bb041dca0d784697af4646d3b62ba4a6b028276ae878e53f6b4f74ddd6db99f"}, - {file = "black-24.3.0-py3-none-any.whl", hash = "sha256:41622020d7120e01d377f74249e677039d20e6344ff5851de8a10f11f513bf93"}, - {file = "black-24.3.0.tar.gz", hash = "sha256:a0c9c4a0771afc6919578cec71ce82a3e31e054904e7197deacbc9382671c41f"}, + {file = "black-24.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6668650ea4b685440857138e5fe40cde4d652633b1bdffc62933d0db4ed9812"}, + {file = "black-24.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1c536fcf674217e87b8cc3657b81809d3c085d7bf3ef262ead700da345bfa6ea"}, + {file = "black-24.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:649fff99a20bd06c6f727d2a27f401331dc0cc861fb69cde910fe95b01b5928f"}, + {file = "black-24.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:fe4d6476887de70546212c99ac9bd803d90b42fc4767f058a0baa895013fbb3e"}, + {file = "black-24.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5a2221696a8224e335c28816a9d331a6c2ae15a2ee34ec857dcf3e45dbfa99ad"}, + {file = "black-24.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f9da3333530dbcecc1be13e69c250ed8dfa67f43c4005fb537bb426e19200d50"}, + {file = "black-24.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4007b1393d902b48b36958a216c20c4482f601569d19ed1df294a496eb366392"}, + {file = "black-24.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:394d4ddc64782e51153eadcaaca95144ac4c35e27ef9b0a42e121ae7e57a9175"}, + {file = "black-24.10.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e39e0fae001df40f95bd8cc36b9165c5e2ea88900167bddf258bacef9bbdc3"}, + {file = "black-24.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d37d422772111794b26757c5b55a3eade028aa3fde43121ab7b673d050949d65"}, + {file = "black-24.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f"}, + {file = "black-24.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:30d2c30dc5139211dda799758559d1b049f7f14c580c409d6ad925b74a4208a8"}, + {file = "black-24.10.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cbacacb19e922a1d75ef2b6ccaefcd6e93a2c05ede32f06a21386a04cedb981"}, + {file = "black-24.10.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1f93102e0c5bb3907451063e08b9876dbeac810e7da5a8bfb7aeb5a9ef89066b"}, + {file = "black-24.10.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ddacb691cdcdf77b96f549cf9591701d8db36b2f19519373d60d31746068dbf2"}, + {file = "black-24.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:680359d932801c76d2e9c9068d05c6b107f2584b2a5b88831c83962eb9984c1b"}, + {file = "black-24.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:17374989640fbca88b6a448129cd1745c5eb8d9547b464f281b251dd00155ccd"}, + {file = "black-24.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:63f626344343083322233f175aaf372d326de8436f5928c042639a4afbbf1d3f"}, + {file = "black-24.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfa1d0cb6200857f1923b602f978386a3a2758a65b52e0950299ea014be6800"}, + {file = "black-24.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cd9c95431d94adc56600710f8813ee27eea544dd118d45896bb734e9d7a0dc7"}, + {file = "black-24.10.0-py3-none-any.whl", hash = "sha256:3bb2b7a1f7b685f85b11fed1ef10f8a9148bceb49853e47a294a3dd963c1dd7d"}, + {file = "black-24.10.0.tar.gz", hash = "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875"}, ] [package.dependencies] @@ -163,7 +163,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] +d = ["aiohttp (>=3.10)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] @@ -1981,4 +1981,4 @@ propcache = ">=0.2.0" [metadata] lock-version = "2.0" python-versions = ">=3.9.0, <4.0" -content-hash = "cd016ddb147a3a426caea6279a04a6dbce95d825f1b128149ca6f35cd5488bf7" +content-hash = "7c54e75811e376c183779d60ba414dc38fe3c3e67a8f32815ed5a3de785355ed" diff --git a/pyproject.toml b/pyproject.toml index 2724f49..595e2e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ attrs = "^23.1.0" httpx = "^0.25.0" [tool.poetry.group.dev.dependencies] -black = "24.3.0" +black = "24.10.0" isort = "^5.13.2" pytest = "^7.1.3" pytest-asyncio = "^0.23.0" diff --git a/src/speckle_automate/fixtures.py b/src/speckle_automate/fixtures.py index d2e4f57..5e92974 100644 --- a/src/speckle_automate/fixtures.py +++ b/src/speckle_automate/fixtures.py @@ -1,4 +1,5 @@ """Some useful helpers for working with automation data.""" + import secrets import string diff --git a/src/speckle_automate/runner.py b/src/speckle_automate/runner.py index 71a27aa..dcac239 100644 --- a/src/speckle_automate/runner.py +++ b/src/speckle_automate/runner.py @@ -61,15 +61,13 @@ def _parse_input_data( def execute_automate_function( automate_function: AutomateFunction[T], input_schema: type[T], -) -> None: - ... +) -> None: ... @overload def execute_automate_function( automate_function: AutomateFunctionWithoutInputs, -) -> None: - ... +) -> None: ... class AutomateGenerateJsonSchema(GenerateJsonSchema): @@ -146,16 +144,14 @@ def run_function( automation_context: AutomationContext, automate_function: AutomateFunction[T], inputs: T, -) -> AutomationContext: - ... +) -> AutomationContext: ... @overload def run_function( automation_context: AutomationContext, automate_function: AutomateFunctionWithoutInputs, -) -> AutomationContext: - ... +) -> AutomationContext: ... def run_function( diff --git a/src/specklepy/api/resources/current/active_user_resource.py b/src/specklepy/api/resources/current/active_user_resource.py index 9716b3f..b8f4c14 100644 --- a/src/specklepy/api/resources/current/active_user_resource.py +++ b/src/specklepy/api/resources/current/active_user_resource.py @@ -44,12 +44,10 @@ class ActiveUserResource(CoreResource): company: Optional[str] = None, bio: Optional[str] = None, avatar: Optional[str] = None, - ) -> User: - ... + ) -> User: ... @overload - def update(self, *, input: UserUpdateInput) -> User: - ... + def update(self, *, input: UserUpdateInput) -> User: ... def update( self, diff --git a/src/specklepy/core/api/resources/current/active_user_resource.py b/src/specklepy/core/api/resources/current/active_user_resource.py index 90bee1c..35d3bbf 100644 --- a/src/specklepy/core/api/resources/current/active_user_resource.py +++ b/src/specklepy/core/api/resources/current/active_user_resource.py @@ -100,12 +100,10 @@ class ActiveUserResource(ResourceBase): company: Optional[str] = None, bio: Optional[str] = None, avatar: Optional[str] = None, - ) -> User: - ... + ) -> User: ... @overload - def update(self, *, input: UserUpdateInput) -> User: - ... + def update(self, *, input: UserUpdateInput) -> User: ... def update( self, diff --git a/src/specklepy/core/api/resources/current/model_resource.py b/src/specklepy/core/api/resources/current/model_resource.py index 6945bbd..5f3d9d0 100644 --- a/src/specklepy/core/api/resources/current/model_resource.py +++ b/src/specklepy/core/api/resources/current/model_resource.py @@ -127,9 +127,11 @@ class ModelResource(ResourceBase): "modelId": model_id, "versionsLimit": versions_limit, "versionsCursor": versions_cursor, - "versionsFilter": versions_filter.model_dump(warnings="error") - if versions_filter - else None, + "versionsFilter": ( + versions_filter.model_dump(warnings="error") + if versions_filter + else None + ), } return self.make_request_and_parse_response( @@ -179,9 +181,9 @@ class ModelResource(ResourceBase): "projectId": project_id, "modelsLimit": models_limit, "modelsCursor": models_cursor, - "modelsFilter": models_filter.model_dump(warnings="error") - if models_filter - else None, + "modelsFilter": ( + models_filter.model_dump(warnings="error") if models_filter else None + ), } return self.make_request_and_parse_response( diff --git a/src/specklepy/core/api/resources/current/project_resource.py b/src/specklepy/core/api/resources/current/project_resource.py index 9029001..f0ca56b 100644 --- a/src/specklepy/core/api/resources/current/project_resource.py +++ b/src/specklepy/core/api/resources/current/project_resource.py @@ -108,9 +108,9 @@ class ProjectResource(ResourceBase): "projectId": project_id, "modelsLimit": models_limit, "modelsCursor": models_cursor, - "modelsFilter": models_filter.model_dump(warnings="error") - if models_filter - else None, + "modelsFilter": ( + models_filter.model_dump(warnings="error") if models_filter else None + ), } return self.make_request_and_parse_response( diff --git a/src/specklepy/core/helpers/speckle_path_provider.py b/src/specklepy/core/helpers/speckle_path_provider.py index 9313836..f673421 100644 --- a/src/specklepy/core/helpers/speckle_path_provider.py +++ b/src/specklepy/core/helpers/speckle_path_provider.py @@ -1,6 +1,7 @@ """ Provides uniform and consistent path helpers for `specklepy` """ + import os import sys from pathlib import Path diff --git a/src/specklepy/objects/other.py b/src/specklepy/objects/other.py index 5a2576e..fbf4d43 100644 --- a/src/specklepy/objects/other.py +++ b/src/specklepy/objects/other.py @@ -295,9 +295,9 @@ class RevitParameter(Base, speckle_type="Objects.BuiltElements.Revit.Parameter") value: Any = None applicationUnitType: Optional[str] = None # eg UnitType UT_Length applicationUnit: Optional[str] = None # DisplayUnitType eg DUT_MILLIMITERS - applicationInternalName: Optional[ - str - ] = None # BuiltInParameterName or GUID for shared parameter + applicationInternalName: Optional[str] = ( + None # BuiltInParameterName or GUID for shared parameter + ) isShared: bool = False isReadOnly: bool = False isTypeParameter: bool = False diff --git a/tests/integration/speckle_automate/test_automation_context.py b/tests/integration/speckle_automate/test_automation_context.py index b114395..b26c351 100644 --- a/tests/integration/speckle_automate/test_automation_context.py +++ b/tests/integration/speckle_automate/test_automation_context.py @@ -1,4 +1,5 @@ """Run integration tests with a speckle server.""" + import os from pathlib import Path from typing import Dict diff --git a/tests/unit/test_geometry.py b/tests/unit/test_geometry.py index 388ddcf..d5d9823 100644 --- a/tests/unit/test_geometry.py +++ b/tests/unit/test_geometry.py @@ -72,7 +72,7 @@ def line(point, interval): start=point, end=point, domain=interval, - units="none" + units="none", # These attributes are not handled in C# # bbox=None, # length=None diff --git a/utils/installer.py b/utils/installer.py index 668ad64..54691c2 100644 --- a/utils/installer.py +++ b/utils/installer.py @@ -1,6 +1,7 @@ """ Provides uniform and consistent path helpers for `specklepy` """ + import os import sys from importlib import import_module, invalidate_caches