diff --git a/cluster_tools/cluster_tools/executors/dask.py b/cluster_tools/cluster_tools/executors/dask.py index 604f4cf2c..e7695b251 100644 --- a/cluster_tools/cluster_tools/executors/dask.py +++ b/cluster_tools/cluster_tools/executors/dask.py @@ -20,7 +20,7 @@ from cluster_tools.executors.multiprocessing_ import CFutDict, MultiprocessingExecutor if TYPE_CHECKING: - from dask.distributed import Client + from distributed import Client _T = TypeVar("_T") _P = ParamSpec("_P") @@ -34,13 +34,13 @@ def __init__( self, **kwargs: Any, ) -> None: - from dask.distributed import Client + from distributed import Client self.client = Client(**kwargs) @classmethod def as_completed(cls, futures: List["Future[_T]"]) -> Iterator["Future[_T]"]: - from dask.distributed import as_completed + from distributed import as_completed return as_completed(futures) diff --git a/cluster_tools/poetry.lock b/cluster_tools/poetry.lock index 435a08503..1476c9f91 100644 --- a/cluster_tools/poetry.lock +++ b/cluster_tools/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "astroid" @@ -238,7 +238,6 @@ files = [ [package.dependencies] click = ">=8.0" cloudpickle = ">=1.5.0" -distributed = {version = "2023.9.2", optional = true, markers = "extra == \"distributed\""} fsspec = ">=2021.09.0" importlib-metadata = ">=4.13.0" packaging = ">=20.0" @@ -361,27 +360,27 @@ tqdm = ["tqdm"] [[package]] name = "google-auth" -version = "2.17.3" +version = "2.23.0" description = "Google Authentication Library" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" +python-versions = ">=3.7" files = [ - {file = "google-auth-2.17.3.tar.gz", hash = "sha256:ce311e2bc58b130fddf316df57c9b3943c2a7b4f6ec31de9663a9333e4064efc"}, - {file = "google_auth-2.17.3-py2.py3-none-any.whl", hash = "sha256:f586b274d3eb7bd932ea424b1c702a30e0393a2e2bc4ca3eae8263ffd8be229f"}, + {file = "google-auth-2.23.0.tar.gz", hash = "sha256:753a26312e6f1eaeec20bc6f2644a10926697da93446e1f8e24d6d32d45a922a"}, + {file = "google_auth-2.23.0-py2.py3-none-any.whl", hash = "sha256:2cec41407bd1e207f5b802638e32bb837df968bb5c05f413d0fa526fac4cf7a7"}, ] [package.dependencies] cachetools = ">=2.0.0,<6.0" pyasn1-modules = ">=0.2.1" -rsa = {version = ">=3.1.4,<5", markers = "python_version >= \"3.6\""} -six = ">=1.9.0" +rsa = ">=3.1.4,<5" +urllib3 = "<2.0" [package.extras] -aiohttp = ["aiohttp (>=3.6.2,<4.0.0dev)", "requests (>=2.20.0,<3.0.0dev)"] +aiohttp = ["aiohttp (>=3.6.2,<4.0.0.dev0)", "requests (>=2.20.0,<3.0.0.dev0)"] enterprise-cert = ["cryptography (==36.0.2)", "pyopenssl (==22.0.0)"] pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"] reauth = ["pyu2f (>=0.1.5)"] -requests = ["requests (>=2.20.0,<3.0.0dev)"] +requests = ["requests (>=2.20.0,<3.0.0.dev0)"] [[package]] name = "icecream" @@ -1165,20 +1164,19 @@ files = [ [[package]] name = "urllib3" -version = "2.0.5" +version = "1.26.16" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=3.7" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ - {file = "urllib3-2.0.5-py3-none-any.whl", hash = "sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e"}, - {file = "urllib3-2.0.5.tar.gz", hash = "sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594"}, + {file = "urllib3-1.26.16-py2.py3-none-any.whl", hash = "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f"}, + {file = "urllib3-1.26.16.tar.gz", hash = "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"}, ] [package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] -secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] -socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] -zstd = ["zstandard (>=0.18.0)"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] +secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "websocket-client" @@ -1309,4 +1307,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8" -content-hash = "ab904511a3f137ff1dbdbcb6d27751e31c61bcd3ae1ff72fdfcb5954dcc0119c" +content-hash = "eaaba052531eb458aee9183aa513730b91810c66ad87fd49078013f5c99559e1" diff --git a/cluster_tools/pyproject.toml b/cluster_tools/pyproject.toml index 5a3c4ac90..abb4331cd 100644 --- a/cluster_tools/pyproject.toml +++ b/cluster_tools/pyproject.toml @@ -9,7 +9,7 @@ repository = "https://github.com/scalableminds/webknossos-libs" [tool.poetry.dependencies] python = ">=3.8" -dask = { version = "^2023.9.1", python = ">=3.9", extras = ["distributed"] } +distributed = { version = "^2023.9.1", python = ">=3.9" } kubernetes = "^27.2.0" typing-extensions = "^4.4.0" diff --git a/requirements.txt b/requirements.txt index 721dbab25..6aab9d654 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -dunamai==1.17.0 -poetry==1.5.1 +dunamai==1.18.1 +poetry==1.6.1