From 42baa7aa668aa122546ef80623f7c40df2b9a70c Mon Sep 17 00:00:00 2001 From: ilan-gold Date: Mon, 17 Feb 2025 16:51:44 +0100 Subject: [PATCH 1/5] (fix): add `dask` bound for sparse issue --- pyproject.toml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b4b5ab14c..e53cf28a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = ["hatchling", "hatch-vcs"] [project] name = "anndata" description = "Annotated data." -requires-python = ">=3.10" +requires-python = ">=3.11" license = "BSD-3-Clause" authors = [ { name = "Philipp Angerer" }, @@ -29,21 +29,19 @@ classifiers = [ "Operating System :: Microsoft :: Windows", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering :: Bio-Informatics", "Topic :: Scientific/Engineering :: Visualization", ] dependencies = [ - # pandas <1.4 has pandas/issues/35446 # pandas 2.1.0rc0 has pandas/issues/54622 - "pandas >=1.4, !=2.1.0rc0, !=2.1.2", - "numpy>=1.23", + "pandas >=2.0.0, !=2.1.0rc0, !=2.1.2", + "numpy>=1.25", # https://github.com/scverse/anndata/issues/1434 - "scipy >1.8", - "h5py>=3.7", - "exceptiongroup; python_version<'3.11'", + "scipy >1.11", + "h5py>=3.8", "natsort", "packaging>=24.2", # array-api-compat 1.5 has https://github.com/scverse/anndata/issues/1410 @@ -108,7 +106,8 @@ gpu = ["cupy"] cu12 = ["cupy-cuda12x"] cu11 = ["cupy-cuda11x"] # https://github.com/dask/dask/issues/11290 -dask = ["dask[array]>=2022.09.2,!=2024.8.*,!=2024.9.*"] +# https://github.com/dask/dask/issues/11752 +dask = ["dask[array]>=2023.5.1,!=2024.8.*,!=2024.9.*,<2025.2.0"] [tool.hatch.version] source = "vcs" From 3adde1a4c0ea3716f2947d217653865cebf6925d Mon Sep 17 00:00:00 2001 From: ilan-gold Date: Mon, 17 Feb 2025 16:53:13 +0100 Subject: [PATCH 2/5] (chore): relnote --- docs/release-notes/1859.bugfix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/release-notes/1859.bugfix.md diff --git a/docs/release-notes/1859.bugfix.md b/docs/release-notes/1859.bugfix.md new file mode 100644 index 000000000..7d62dafce --- /dev/null +++ b/docs/release-notes/1859.bugfix.md @@ -0,0 +1 @@ +Bound {mod}`dask` due to {issue}`dask/dask#11752` {user}`ilan-gold` From e225caa15483201730c73fd799699e491511e4bc Mon Sep 17 00:00:00 2001 From: ilan-gold Date: Mon, 17 Feb 2025 16:55:32 +0100 Subject: [PATCH 3/5] (fix): undo scientific python changes --- pyproject.toml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e53cf28a5..e898887d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = ["hatchling", "hatch-vcs"] [project] name = "anndata" description = "Annotated data." -requires-python = ">=3.11" +requires-python = ">=3.10" license = "BSD-3-Clause" authors = [ { name = "Philipp Angerer" }, @@ -29,19 +29,21 @@ classifiers = [ "Operating System :: Microsoft :: Windows", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering :: Bio-Informatics", "Topic :: Scientific/Engineering :: Visualization", ] dependencies = [ + # pandas <1.4 has pandas/issues/35446 # pandas 2.1.0rc0 has pandas/issues/54622 - "pandas >=2.0.0, !=2.1.0rc0, !=2.1.2", - "numpy>=1.25", + "pandas >=1.4, !=2.1.0rc0, !=2.1.2", + "numpy>=1.23", # https://github.com/scverse/anndata/issues/1434 - "scipy >1.11", - "h5py>=3.8", + "scipy >1.8", + "h5py>=3.7", + "exceptiongroup; python_version<'3.11'", "natsort", "packaging>=24.2", # array-api-compat 1.5 has https://github.com/scverse/anndata/issues/1410 From 021d8f9a9f2bd019e4069b76d80c7b89e3bdbc18 Mon Sep 17 00:00:00 2001 From: ilan-gold Date: Mon, 17 Feb 2025 17:01:20 +0100 Subject: [PATCH 4/5] (fix): no `mod` dask --- docs/release-notes/1859.bugfix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-notes/1859.bugfix.md b/docs/release-notes/1859.bugfix.md index 7d62dafce..5bdc17112 100644 --- a/docs/release-notes/1859.bugfix.md +++ b/docs/release-notes/1859.bugfix.md @@ -1 +1 @@ -Bound {mod}`dask` due to {issue}`dask/dask#11752` {user}`ilan-gold` +Bound `dask` due to {issue}`dask/dask#11752` {user}`ilan-gold` From 7f87e9cfb2340f0de4e2990267b2178d7526e6da Mon Sep 17 00:00:00 2001 From: Ilan Gold Date: Tue, 18 Feb 2025 10:59:15 +0100 Subject: [PATCH 5/5] (fix): remove deprecation schedule schange --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e898887d8..3ac288a0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,7 +109,7 @@ cu12 = ["cupy-cuda12x"] cu11 = ["cupy-cuda11x"] # https://github.com/dask/dask/issues/11290 # https://github.com/dask/dask/issues/11752 -dask = ["dask[array]>=2023.5.1,!=2024.8.*,!=2024.9.*,<2025.2.0"] +dask = ["dask[array]>=2022.09.2,!=2024.8.*,!=2024.9.*,<2025.2.0"] [tool.hatch.version] source = "vcs"