diff --git a/poetry.lock b/poetry.lock index 248e90b7..861c9d9a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -94,7 +94,7 @@ description = "Backport of CPython tarfile module" optional = false python-versions = ">=3.8" groups = ["deploy"] -markers = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\" or python_version == \"3.11\"" +markers = "python_version < \"3.12\"" files = [ {file = "backports.tarfile-1.2.0-py3-none-any.whl", hash = "sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34"}, {file = "backports_tarfile-1.2.0.tar.gz", hash = "sha256:d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991"}, @@ -753,7 +753,7 @@ files = [ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, ] -markers = {main = "(python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\") and (extra == \"all\" or extra == \"language-server\")", dev = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\""} +markers = {main = "(extra == \"all\" or extra == \"language-server\") and (python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\")", dev = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\""} [package.extras] test = ["pytest (>=6)"] @@ -2027,30 +2027,25 @@ files = [ [[package]] name = "opencv-python" -version = "4.10.0.84" +version = "4.12.0.88" description = "Wrapper package for OpenCV python bindings." optional = false python-versions = ">=3.6" groups = ["image_analysis"] files = [ - {file = "opencv-python-4.10.0.84.tar.gz", hash = "sha256:72d234e4582e9658ffea8e9cae5b63d488ad06994ef12d81dc303b17472f3526"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:fc182f8f4cda51b45f01c64e4cbedfc2f00aff799debebc305d8d0210c43f251"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-macosx_12_0_x86_64.whl", hash = "sha256:71e575744f1d23f79741450254660442785f45a0797212852ee5199ef12eed98"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09a332b50488e2dda866a6c5573ee192fe3583239fb26ff2f7f9ceb0bc119ea6"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ace140fc6d647fbe1c692bcb2abce768973491222c067c131d80957c595b71f"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-win32.whl", hash = "sha256:2db02bb7e50b703f0a2d50c50ced72e95c574e1e5a0bb35a8a86d0b35c98c236"}, - {file = "opencv_python-4.10.0.84-cp37-abi3-win_amd64.whl", hash = "sha256:32dbbd94c26f611dc5cc6979e6b7aa1f55a64d6b463cc1dcd3c95505a63e48fe"}, + {file = "opencv-python-4.12.0.88.tar.gz", hash = "sha256:8b738389cede219405f6f3880b851efa3415ccd674752219377353f017d2994d"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-macosx_13_0_arm64.whl", hash = "sha256:f9a1f08883257b95a5764bf517a32d75aec325319c8ed0f89739a57fae9e92a5"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-macosx_13_0_x86_64.whl", hash = "sha256:812eb116ad2b4de43ee116fcd8991c3a687f099ada0b04e68f64899c09448e81"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:51fd981c7df6af3e8f70b1556696b05224c4e6b6777bdd2a46b3d4fb09de1a92"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:092c16da4c5a163a818f120c22c5e4a2f96e0db4f24e659c701f1fe629a690f9"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-win32.whl", hash = "sha256:ff554d3f725b39878ac6a2e1fa232ec509c36130927afc18a1719ebf4fbf4357"}, + {file = "opencv_python-4.12.0.88-cp37-abi3-win_amd64.whl", hash = "sha256:d98edb20aa932fd8ebd276a72627dad9dc097695b3d435a4257557bbb49a79d2"}, ] [package.dependencies] numpy = [ - {version = ">=1.21.0", markers = "python_version <= \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\" and python_version >= \"3.8\""}, - {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\""}, - {version = ">=1.17.3", markers = "(platform_system != \"Darwin\" or platform_machine != \"arm64\" or python_version > \"3.9\") and python_version >= \"3.8\" and (platform_system != \"Linux\" or platform_machine != \"aarch64\")"}, - {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, - {version = ">=1.23.5", markers = "python_version == \"3.11\""}, - {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 = "<2.0", markers = "python_version < \"3.9\""}, + {version = ">=2,<2.3.0", markers = "python_version >= \"3.9\""}, ] [[package]] @@ -3737,11 +3732,11 @@ description = "A lil' TOML parser" optional = false python-versions = ">=3.8" groups = ["dev", "docs", "style"] -markers = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\"" files = [ {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"}, {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"}, ] +markers = {dev = "python_full_version <= \"3.11.0a6\"", docs = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\"", style = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\""} [[package]] name = "twine" @@ -3804,7 +3799,7 @@ files = [ {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] -markers = {deploy = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\"", dev = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\"", docs = "python_version == \"3.8\" or python_version == \"3.9\" or python_version == \"3.10\""} +markers = {deploy = "python_version < \"3.13\"", dev = "python_version < \"3.13\"", docs = "python_version < \"3.13\""} [[package]] name = "tzdata" @@ -3999,4 +3994,4 @@ svg = ["drawsvg"] [metadata] lock-version = "2.1" python-versions = "^3.8" -content-hash = "a767ef49e036a88f4b2f1f41f6f90cf12188f1087e8df9e7392624296ecdd864" +content-hash = "a33d1277a019a00eef5f43ffb1c8cbe00a918d39a22456b7cbd1ecd09ef021fa" diff --git a/pyproject.toml b/pyproject.toml index 32c16178..b69b5890 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ pytest-mock = "^3.14.0" optional = true [tool.poetry.group.image_analysis.dependencies] -opencv-python = "^4.10.0.84" +opencv-python = "^4.12.0.88" scikit-image = [ { version = ">=0.20.0,<0.22.0", python = ">=3.8,<3.9" }, { version = ">=0.22.0,<1.0.0", python = ">=3.9" },