diff --git a/darwin/version/__init__.py b/darwin/version/__init__.py index d2a1e73f8..af8454f54 100644 --- a/darwin/version/__init__.py +++ b/darwin/version/__init__.py @@ -1 +1 @@ -__version__ = "0.8.46" +__version__ = "0.8.47" diff --git a/poetry.lock b/poetry.lock index 29fe507a9..57ca2ff3c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -353,6 +353,21 @@ files = [ [package.extras] test = ["pytest (>=6)"] +[[package]] +name = "fastjsonschema" +version = "2.18.1" +description = "Fastest Python implementation of JSON schema" +category = "main" +optional = true +python-versions = "*" +files = [ + {file = "fastjsonschema-2.18.1-py3-none-any.whl", hash = "sha256:aec6a19e9f66e9810ab371cc913ad5f4e9e479b63a7072a2cd060a9369e329a8"}, + {file = "fastjsonschema-2.18.1.tar.gz", hash = "sha256:06dc8680d937628e993fa0cd278f196d20449a1adc087640710846b324d422ea"}, +] + +[package.extras] +devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"] + [[package]] name = "humanize" version = "4.6.0" @@ -501,6 +516,7 @@ files = [ name = "json-stream" version = "2.3.2" description = "Streaming JSON encoder and decoder" +category = "main" optional = false python-versions = "<4,>=3.5" files = [ @@ -519,6 +535,7 @@ requests = ["requests"] name = "json-stream-rs-tokenizer" version = "0.4.25" description = "A faster tokenizer for the json-stream Python library" +category = "main" optional = false python-versions = ">=3.7,<4" files = [ @@ -918,12 +935,12 @@ files = [ [package.dependencies] numpy = [ - {version = ">=1.21.0", markers = "python_version <= \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\" and python_version >= \"3.7\""}, + {version = ">=1.21.0", markers = "python_version <= \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\""}, + {version = ">=1.21.2", markers = "python_version >= \"3.10\""}, {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\""}, - {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\""}, - {version = ">=1.19.3", markers = "platform_system == \"Linux\" and python_version < \"3.10\" and platform_machine == \"aarch64\" and python_version >= \"3.7\" or python_version < \"3.10\" and platform_system != \"Darwin\" and python_version >= \"3.9\" or python_version < \"3.10\" and python_version >= \"3.9\" and platform_machine != \"arm64\" or python_version > \"3.9\" and python_version < \"3.10\""}, - {version = ">=1.17.3", markers = "(platform_system != \"Darwin\" and platform_system != \"Linux\") and python_version >= \"3.8\" and python_version < \"3.9\" or platform_system != \"Darwin\" and python_version >= \"3.8\" and python_version < \"3.9\" and platform_machine != \"aarch64\" or platform_machine != \"arm64\" and python_version >= \"3.8\" and python_version < \"3.9\" and platform_system != \"Linux\" or (platform_machine != \"arm64\" and platform_machine != \"aarch64\") and python_version >= \"3.8\" and python_version < \"3.9\""}, - {version = ">=1.17.0", markers = "(platform_system != \"Darwin\" and platform_system != \"Linux\") and python_version >= \"3.7\" and python_version < \"3.8\" or platform_system != \"Darwin\" and python_version >= \"3.7\" and python_version < \"3.8\" and platform_machine != \"aarch64\" or platform_machine != \"arm64\" and python_version >= \"3.7\" and python_version < \"3.8\" and platform_system != \"Linux\" or (platform_machine != \"arm64\" and platform_machine != \"aarch64\") and python_version >= \"3.7\" and python_version < \"3.8\""}, + {version = ">=1.19.3", markers = "python_version >= \"3.6\" and platform_system == \"Linux\" and platform_machine == \"aarch64\" or python_version >= \"3.9\""}, + {version = ">=1.17.0", markers = "python_version >= \"3.7\""}, + {version = ">=1.17.3", markers = "python_version >= \"3.8\""}, ] [[package]] @@ -1612,11 +1629,6 @@ files = [ {file = "scikit_learn-1.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f66eddfda9d45dd6cadcd706b65669ce1df84b8549875691b1f403730bdef217"}, {file = "scikit_learn-1.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c6448c37741145b241eeac617028ba6ec2119e1339b1385c9720dae31367f2be"}, {file = "scikit_learn-1.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:c413c2c850241998168bbb3bd1bb59ff03b1195a53864f0b80ab092071af6028"}, - {file = "scikit_learn-1.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ef540e09873e31569bc8b02c8a9f745ee04d8e1263255a15c9969f6f5caa627f"}, - {file = "scikit_learn-1.3.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:9147a3a4df4d401e618713880be023e36109c85d8569b3bf5377e6cd3fecdeac"}, - {file = "scikit_learn-1.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2cd3634695ad192bf71645702b3df498bd1e246fc2d529effdb45a06ab028b4"}, - {file = "scikit_learn-1.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c275a06c5190c5ce00af0acbb61c06374087949f643ef32d355ece12c4db043"}, - {file = "scikit_learn-1.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:0e1aa8f206d0de814b81b41d60c1ce31f7f2c7354597af38fae46d9c47c45122"}, {file = "scikit_learn-1.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:52b77cc08bd555969ec5150788ed50276f5ef83abb72e6f469c5b91a0009bbca"}, {file = "scikit_learn-1.3.1-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:a683394bc3f80b7c312c27f9b14ebea7766b1f0a34faf1a2e9158d80e860ec26"}, {file = "scikit_learn-1.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a15d964d9eb181c79c190d3dbc2fff7338786bf017e9039571418a1d53dab236"}, @@ -1994,6 +2006,27 @@ secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17. socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] +[[package]] +name = "validate-pyproject" +version = "0.15" +description = "Validation library and CLI tool for checking on 'pyproject.toml' files using JSON Schema" +category = "main" +optional = true +python-versions = ">=3.6" +files = [ + {file = "validate-pyproject-0.15.tar.gz", hash = "sha256:fc82b61f887739a4092de612466a5ab28ec47c407b19c6caef8d54c88c1d10c0"}, + {file = "validate_pyproject-0.15-py3-none-any.whl", hash = "sha256:573a5e4858f0bf0cd0f429142cbadbaa83595ce6e3cac322a2a7c3866f4a1458"}, +] + +[package.dependencies] +fastjsonschema = ">=2.16.2,<=3" +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +all = ["packaging (>=20.4)", "tomli (>=1.2.1)", "trove-classifiers (>=2021.10.20)"] +testing = ["pytest", "pytest-cov", "pytest-randomly", "pytest-xdist", "repo-review", "setuptools", "tomli (>=1.2.1)"] +typecheck = ["importlib-resources", "mypy"] + [[package]] name = "wheel" version = "0.41.2" @@ -2026,7 +2059,7 @@ docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] [extras] -dev = ["black", "debugpy", "isort", "mypy", "pytest", "pytest-rerunfailures", "responses", "ruff"] +dev = ["black", "debugpy", "isort", "mypy", "pytest", "pytest-rerunfailures", "responses", "ruff", "validate-pyproject"] medical = ["connected-components-3d", "nibabel"] ml = ["albumentations", "scikit-learn", "torch", "torchvision"] ocv = ["opencv-python-headless"] @@ -2035,4 +2068,4 @@ test = ["pytest", "responses"] [metadata] lock-version = "2.0" python-versions = ">=3.7.0,<3.11" -content-hash = "1b01a0de65a14aaa6261a525c3399fb3055eff7e02a5afdc1df1168fb46a1ece" \ No newline at end of file +content-hash = "21256e1ec8c44aea0d6ea225730f6141c172dca223302bf7a5fe8b755a720a61" diff --git a/pyproject.toml b/pyproject.toml index 48174f739..2efd43056 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "darwin-py" -version = "0.8.46" +version = "0.8.47" description = "Library and command line interface for darwin.v7labs.com" homepage = "https://docs.v7labs.com/reference/getting-started-2" documentation = "https://darwin-py-sdk.v7labs.com/index.html" @@ -20,7 +20,6 @@ classifiers = [ [[tool.poetry.packages]] include = "darwin" - [tool.isort] profile = "black" @@ -59,11 +58,6 @@ select = ["E", "F", "C"] ignore = ["E203", "E402", "E501"] line-length = 88 -[tool.ruff.per-file-ignores] -"__init__.py" = ["E402", "F401"] -"**/{tests,docs,tools}/*" = ["E402", "F403"] - - [tool.flake8] max-line-length = 88 ignore = ["E203", "W503", "E402"] @@ -78,7 +72,6 @@ humanize = "^4.4.0" pillow = "^9.4.0" requests = "^2.28.1" rich = "^13.0.1" -dataclasses = { markers = "python_version < \"3.7\"", version = "^0.8" } upolygon = "0.1.10" jsonschema = ">=4.0.0" deprecation = "^2.1.0" @@ -86,28 +79,11 @@ pydantic = "^1.10.4" orjson = "^3.8.5" numpy = "*" toml = "^0.10.2" -nibabel = { version = "^5.0.0", python = ">=3.8.1", optional = true } -connected-components-3d = { version = "^3.10.3", optional = true } -scikit-learn = { version = "^1.2.0", python = ">=3.8.1,<3.11", optional = true } -albumentations = { version = "^1.3.1", python = ">=3.8", optional = true } -torch = { version = "^1.13.1", optional = true } -torchvision = { version = "^0.14.1", optional = true } -black = { version = "^22.12.0", optional = true } -isort = { version = "^5.11.4", optional = true } -mypy = { version = "^1.5", optional = true, python = ">=3.8" } -responses = { version = "^0.22.0", optional = true } -pytest = { version = "^7.2.1", optional = true } -debugpy = { version = "^1.6.5", optional = true } types-requests = "^2.28.11.8" -mpire = { version = "^2.7.0" } tqdm = "^4.64.1" types-pyyaml = "^6.0.12.9" -python-dotenv = { version = "^1.0.0", python = ">3.8" } -opencv-python-headless = { version = "^4.8.0.76", optional = true } pyyaml = "^6.0.1" -pytest-rerunfailures = { version = "^12.0", optional = true } json-stream = "^2.3.2" -ruff = { version = "^0.0.292", optional = true } [tool.poetry.extras] @@ -122,6 +98,7 @@ dev = [ "flake8-pyproject", "pytest-rerunfailures", "ruff", + "validate-pyproject", ] test = ["responses", "pytest", "flake8-pyproject"] ml = ["torch", "torchvision", "scikit-learn", "albumentations"] @@ -130,3 +107,86 @@ ocv = ["opencv-python-headless"] [tool.poetry.scripts] darwin = "darwin.cli:main" + +[tool.ruff.per-file-ignores] +"__init__.py" = ["E402", "F401"] +"**/{tests,docs,tools}/*" = ["E402", "F403"] + +[tool.poetry.dependencies.dataclasses] +markers = "python_version < \"3.7\"" +version = "^0.8" + +[tool.poetry.dependencies.nibabel] +version = "^5.0.0" +python = ">=3.8.1" +optional = true + +[tool.poetry.dependencies.connected-components-3d] +version = "^3.10.3" +optional = true + +[tool.poetry.dependencies.scikit-learn] +version = "^1.2.0" +python = ">=3.8.1,<3.11" +optional = true + +[tool.poetry.dependencies.albumentations] +version = "^1.3.1" +python = ">=3.8" +optional = true + +[tool.poetry.dependencies.torch] +version = "^1.13.1" +optional = true + +[tool.poetry.dependencies.torchvision] +version = "^0.14.1" +optional = true + +[tool.poetry.dependencies.black] +version = "^22.12.0" +optional = true + +[tool.poetry.dependencies.isort] +version = "^5.11.4" +optional = true + +[tool.poetry.dependencies.mypy] +version = "^1.5" +optional = true +python = ">=3.8" + +[tool.poetry.dependencies.responses] +version = "^0.22.0" +optional = true + +[tool.poetry.dependencies.pytest] +version = "^7.2.1" +optional = true + +[tool.poetry.dependencies.debugpy] +version = "^1.6.5" +optional = true + +[tool.poetry.dependencies.mpire] +version = "^2.7.0" + +[tool.poetry.dependencies.python-dotenv] +version = "^1.0.0" +python = ">3.8" + +[tool.poetry.dependencies.opencv-python-headless] +version = "^4.8.0.76" +optional = true + +[tool.poetry.dependencies.pytest-rerunfailures] +version = "^12.0" +optional = true + +[tool.poetry.dependencies.ruff] +version = "^0.0.292" +optional = true + +[tool.poetry.dependencies.validate-pyproject] +version = "^0.15" +optional = true