Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch scipy<1.15 for anndata<0.11.2 #937

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

jdblischak
Copy link
Member

Checklist

  • Used a static YAML file for the patch if possible (instructions).
  • Ran pre-commit run -a and ensured all files pass the linting checks.
  • Ran python show_diff.py and posted the output as part of the PR.
  • Modifications won't affect packages built in the future.

scipy 1.15 introduced an incompatibility, which anndata fixed in 0.11.2. This patch prevents previous releases from being co-installed with scipy 1.15

cc: @flying-sheep, @conda-forge/anndata
xref: scverse/anndata#1806, conda-forge/anndata-feedstock#49, scverse/anndata#1802, scverse/anndata#1811, scverse/anndata#1813

$ python show_diff.py --subdir noarch
================================================================================
================================================================================
noarch
noarch::anndata-0.6.22.post1-py_0.tar.bz2
noarch::anndata-0.6.22.post1-py_1.tar.bz2
-    "scipy"
+    "scipy <1.15.0a0"
noarch::anndata-0.8.0-pyhd8ed1ab_1.tar.bz2
noarch::anndata-0.9.0-pyhd8ed1ab_0.conda
-    "scipy >=1.4",
+    "scipy >=1.4,<1.15.0a0",
noarch::anndata-0.10.0-pyhd8ed1ab_0.conda
noarch::anndata-0.10.1-pyhd8ed1ab_0.conda
noarch::anndata-0.10.2-pyhd8ed1ab_0.conda
noarch::anndata-0.10.3-pyhd8ed1ab_0.conda
noarch::anndata-0.10.4-pyhd8ed1ab_0.conda
noarch::anndata-0.10.5-pyhd8ed1ab_0.conda
noarch::anndata-0.10.5.post1-pyhd8ed1ab_0.conda
noarch::anndata-0.9.0-pyhd8ed1ab_1.conda
noarch::anndata-0.9.1-pyhd8ed1ab_0.conda
noarch::anndata-0.9.2-pyhd8ed1ab_0.conda
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"
noarch::anndata-0.10.6-pyhd8ed1ab_0.conda
noarch::anndata-0.10.7-pyhd8ed1ab_0.conda
noarch::anndata-0.10.8-pyhd8ed1ab_0.conda
noarch::anndata-0.10.9-pyhd8ed1ab_0.conda
noarch::anndata-0.11.0-pyhd8ed1ab_0.conda
noarch::anndata-0.11.0-pyhff2d567_1.conda
noarch::anndata-0.11.1-pyhd8ed1ab_1.conda
noarch::anndata-0.11.1-pyhff2d567_0.conda
-    "scipy >=1.8"
+    "scipy >=1.8,<1.15.0a0"

@jdblischak jdblischak requested a review from a team as a code owner January 9, 2025 16:11
@conda-forge-admin
Copy link
Contributor

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

@jdblischak
Copy link
Member Author

The diff from the CI run:

Click for diff
================================================================================
================================================================================
linux-armv7l

patching repodata:   0%|          | 0/9 [00:00<?, ?it/s]
patching repodata:  11%|█         | 1/9 [00:00<00:05,  1.39it/s]

================================================================================
================================================================================
linux-ppc64le

patching repodata:  22%|██▏       | 2/9 [02:35<10:40, 91.53s/it]

================================================================================
================================================================================
linux-aarch64

patching repodata:  33%|███▎      | 3/9 [02:57<05:59, 59.86s/it]

================================================================================
================================================================================
noarch
noarch::anndata-0.6.22.post1-py_1.tar.bz2
noarch::anndata-0.6.22.post1-py_0.tar.bz2
-    "scipy"
+    "scipy <1.15.0a0"
noarch::anndata-0.8.0-pyhd8ed1ab_1.tar.bz2
noarch::anndata-0.9.0-pyhd8ed1ab_0.conda
-    "scipy >=1.4",
+    "scipy >=1.4,<1.15.0a0",
noarch::anndata-0.11.1-pyhff2d567_0.conda
noarch::anndata-0.11.0-pyhff2d567_1.conda
noarch::anndata-0.10.7-pyhd8ed1ab_0.conda
noarch::anndata-0.11.0-pyhd8ed1ab_0.conda
noarch::anndata-0.11.1-pyhd8ed1ab_1.conda
noarch::anndata-0.10.9-pyhd8ed1ab_0.conda
noarch::anndata-0.10.8-pyhd8ed1ab_0.conda
noarch::anndata-0.10.6-pyhd8ed1ab_0.conda
-    "scipy >=1.8"
+    "scipy >=1.8,<1.15.0a0"
noarch::anndata-0.9.0-pyhd8ed1ab_1.conda
noarch::anndata-0.10.5.post1-pyhd8ed1ab_0.conda
noarch::anndata-0.10.4-pyhd8ed1ab_0.conda
noarch::anndata-0.10.1-pyhd8ed1ab_0.conda
noarch::anndata-0.10.5-pyhd8ed1ab_0.conda
noarch::anndata-0.10.2-pyhd8ed1ab_0.conda
noarch::anndata-0.10.0-pyhd8ed1ab_0.conda
noarch::anndata-0.10.3-pyhd8ed1ab_0.conda
noarch::anndata-0.9.2-pyhd8ed1ab_0.conda
noarch::anndata-0.9.1-pyhd8ed1ab_0.conda
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"

patching repodata:  44%|████▍     | 4/9 [03:20<03:45, 45.03s/it]

================================================================================
================================================================================
win-32

patching repodata:  56%|█████▌    | 5/9 [03:42<02:27, 36.84s/it]

================================================================================
================================================================================
osx-arm64
osx-arm64::anndata-0.7.6-py39h2804cbe_0.tar.bz2
osx-arm64::anndata-0.7.8-py39h2804cbe_1.tar.bz2
osx-arm64::anndata-0.7.8-py39h2804cbe_0.tar.bz2
osx-arm64::anndata-0.7.8-py310hbe9552e_1.tar.bz2
osx-arm64::anndata-0.8.0-py39h2804cbe_0.tar.bz2
osx-arm64::anndata-0.7.7-py38h10201cd_0.tar.bz2
osx-arm64::anndata-0.7.7-py39h2804cbe_0.tar.bz2
osx-arm64::anndata-0.8.0-py38h10201cd_0.tar.bz2
osx-arm64::anndata-0.7.8-py38h10201cd_0.tar.bz2
osx-arm64::anndata-0.7.6-py38h10201cd_0.tar.bz2
osx-arm64::anndata-0.8.0-py310hbe9552e_0.tar.bz2
osx-arm64::anndata-0.7.8-py38h10201cd_1.tar.bz2
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"


================================================================================
================================================================================
linux-64
linux-64::anndata-0.7.8-py38h578d9bd_0.tar.bz2
linux-64::anndata-0.7.8-py37h89c1867_1.tar.bz2
linux-64::anndata-0.7.6-py38h578d9bd_0.tar.bz2
linux-64::anndata-0.7.7-py38h578d9bd_0.tar.bz2
linux-64::anndata-0.7.8-py39hf3d152e_0.tar.bz2
linux-64::anndata-0.7.8-py39hf3d152e_1.tar.bz2
linux-64::anndata-0.7.6-py37h89c1867_0.tar.bz2
linux-64::anndata-0.7.8-py38h578d9bd_1.tar.bz2
linux-64::anndata-0.7.7-py39hf3d152e_0.tar.bz2
linux-64::anndata-0.7.6-py36h5fab9bb_0.tar.bz2
linux-64::anndata-0.7.6-py39hf3d152e_0.tar.bz2
linux-64::anndata-0.7.8-py37h89c1867_0.tar.bz2
linux-64::anndata-0.7.8-py310hff52083_1.tar.bz2
linux-64::anndata-0.8.0-py39hf3d152e_0.tar.bz2
linux-64::anndata-0.7.7-py37h89c1867_0.tar.bz2
linux-64::anndata-0.8.0-py310hff52083_0.tar.bz2
linux-64::anndata-0.8.0-py38h578d9bd_0.tar.bz2
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"
linux-64::anndata-0.7.5-py39hf3d152e_0.tar.bz2
linux-64::anndata-0.7.1-py36_0.tar.bz2
linux-64::anndata-0.7.4-py38h32f6830_0.tar.bz2
linux-64::anndata-0.7.1-py37_0.tar.bz2
linux-64::anndata-0.7.3-py37hc8dfbb8_0.tar.bz2
linux-64::anndata-0.7.4-py36h5fab9bb_1.tar.bz2
linux-64::anndata-0.7-py36_0.tar.bz2
linux-64::anndata-0.7.5-py38h578d9bd_0.tar.bz2
linux-64::anndata-0.7.4-py38h578d9bd_1.tar.bz2
patching repodata:  67%|██████▋   | 6/9 [05:45<03:17, 65.95s/it]
linux-64::anndata-0.7.5-py37h89c1867_0.tar.bz2
linux-64::anndata-0.7-py37_0.tar.bz2
linux-64::anndata-0.7.4-py36h9f0ad1d_0.tar.bz2
linux-64::anndata-0.7.4-py39hf3d152e_1.tar.bz2
linux-64::anndata-0.7.3-py38h32f6830_0.tar.bz2
linux-64::anndata-0.7.3-py36h9f0ad1d_0.tar.bz2
linux-64::anndata-0.7.4-py37hc8dfbb8_0.tar.bz2
linux-64::anndata-0.7.5-py36h5fab9bb_0.tar.bz2
linux-64::anndata-0.7.1-py38_0.tar.bz2
linux-64::anndata-0.7.4-py37h89c1867_1.tar.bz2
-    "scipy"
+    "scipy <1.15.0a0"
linux-64::anndata-0.8.0-py37h89c1867_0.tar.bz2
-    "scipy >=1.4",
+    "scipy >=1.4,<1.15.0a0",

patching repodata:  78%|███████▊  | 7/9 [07:29<02:36, 78.40s/it]

================================================================================
================================================================================
win-64
win-64::anndata-0.7.8-py310h5588dad_1.tar.bz2
win-64::anndata-0.7.8-py39hcbf5309_1.tar.bz2
win-64::anndata-0.7.6-py36ha15d459_0.tar.bz2
win-64::anndata-0.7.7-py39hcbf5309_0.tar.bz2
win-64::anndata-0.8.0-py38haa244fe_0.tar.bz2
win-64::anndata-0.7.6-py39hcbf5309_0.tar.bz2
win-64::anndata-0.7.8-py38haa244fe_1.tar.bz2
win-64::anndata-0.7.8-py39hcbf5309_0.tar.bz2
win-64::anndata-0.7.7-py38haa244fe_0.tar.bz2
win-64::anndata-0.8.0-py39hcbf5309_0.tar.bz2
win-64::anndata-0.7.6-py38haa244fe_0.tar.bz2
win-64::anndata-0.8.0-py310h5588dad_0.tar.bz2
win-64::anndata-0.7.8-py37h03978a9_1.tar.bz2
win-64::anndata-0.7.7-py37h03978a9_0.tar.bz2
win-64::anndata-0.7.8-py38haa244fe_0.tar.bz2
win-64::anndata-0.7.6-py37h03978a9_0.tar.bz2
win-64::anndata-0.7.8-py37h03978a9_0.tar.bz2
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"
win-64::anndata-0.7.4-py38haa244fe_1.tar.bz2
win-64::anndata-0.7.4-py36h9f0ad1d_0.tar.bz2
win-64::anndata-0.7.3-py38h32f6830_0.tar.bz2
win-64::anndata-0.7.5-py37h03978a9_0.tar.bz2
win-64::anndata-0.7.1-py36_0.tar.bz2
win-64::anndata-0.7.5-py36ha15d459_0.tar.bz2
win-64::anndata-0.7.1-py37_0.tar.bz2
win-64::anndata-0.7.4-py37h03978a9_1.tar.bz2
win-64::anndata-0.7.5-py38haa244fe_0.tar.bz2
win-64::anndata-0.7.5-py39hcbf5309_0.tar.bz2
win-64::anndata-0.7.4-py36ha15d459_1.tar.bz2
win-64::anndata-0.7-py36_0.tar.bz2
win-64::anndata-0.7-py37_0.tar.bz2
win-64::anndata-0.7.4-py38h32f6830_0.tar.bz2
win-64::anndata-0.7.4-py37hc8dfbb8_0.tar.bz2
win-64::anndata-0.7.3-py36h9f0ad1d_0.tar.bz2
win-64::anndata-0.7.1-py38_0.tar.bz2
win-64::anndata-0.7.3-py37hc8dfbb8_0.tar.bz2
win-64::anndata-0.7.4-py39hcbf5309_1.tar.bz2
-    "scipy"
+    "scipy <1.15.0a0"
win-64::anndata-0.8.0-py37h03978a9_0.tar.bz2
-    "scipy >=1.4",
+    "scipy >=1.4,<1.15.0a0",


================================================================================
patching repodata:  89%|████████▉ | 8/9 [08:26<01:11, 71.87s/it]
================================================================================
patching repodata: 100%|██████████| 9/9 [08:41<00:00, 54.02s/it]
osx-64
patching repodata: 100%|██████████| 9/9 [08:41<00:00, 57.97s/it]
osx-64::anndata-0.7-py36_0.tar.bz2
osx-64::anndata-0.7.4-py38h50d1736_1.tar.bz2
osx-64::anndata-0.7.3-py38h32f6830_0.tar.bz2
osx-64::anndata-0.7.5-py38h50d1736_0.tar.bz2
osx-64::anndata-0.7-py37_0.tar.bz2
osx-64::anndata-0.7.5-py39h6e9494a_0.tar.bz2
osx-64::anndata-0.7.4-py37hc8dfbb8_0.tar.bz2
osx-64::anndata-0.7.1-py36_0.tar.bz2
osx-64::anndata-0.7.4-py39h6e9494a_1.tar.bz2
osx-64::anndata-0.7.3-py37hc8dfbb8_0.tar.bz2
osx-64::anndata-0.7.1-py38_0.tar.bz2
osx-64::anndata-0.7.1-py37_0.tar.bz2
osx-64::anndata-0.7.3-py36h9f0ad1d_0.tar.bz2
osx-64::anndata-0.7.4-py38h32f6830_0.tar.bz2
osx-64::anndata-0.7.5-py36h79c6626_0.tar.bz2
osx-64::anndata-0.7.4-py36h9f0ad1d_0.tar.bz2
osx-64::anndata-0.7.4-py36h79c6626_1.tar.bz2
osx-64::anndata-0.7.4-py37hf985489_1.tar.bz2
osx-64::anndata-0.7.5-py37hf985489_0.tar.bz2
-    "scipy"
+    "scipy <1.15.0a0"
osx-64::anndata-0.7.7-py38h50d1736_0.tar.bz2
osx-64::anndata-0.7.7-py39h6e9494a_0.tar.bz2
osx-64::anndata-0.7.8-py37hf985489_1.tar.bz2
osx-64::anndata-0.7.6-py36h79c6626_0.tar.bz2
osx-64::anndata-0.7.7-py37hf985489_0.tar.bz2
osx-64::anndata-0.8.0-py39h6e9494a_0.tar.bz2
osx-64::anndata-0.7.6-py39h6e9494a_0.tar.bz2
osx-64::anndata-0.7.6-py38h50d1736_0.tar.bz2
osx-64::anndata-0.7.8-py37hf985489_0.tar.bz2
osx-64::anndata-0.7.8-py39h6e9494a_1.tar.bz2
osx-64::anndata-0.8.0-py310h2ec42d9_0.tar.bz2
osx-64::anndata-0.7.8-py310h2ec42d9_1.tar.bz2
osx-64::anndata-0.7.8-py39h6e9494a_0.tar.bz2
osx-64::anndata-0.7.6-py37hf985489_0.tar.bz2
osx-64::anndata-0.7.8-py38h50d1736_0.tar.bz2
osx-64::anndata-0.7.8-py38h50d1736_1.tar.bz2
osx-64::anndata-0.8.0-py38h50d1736_0.tar.bz2
-    "scipy >=1.4"
+    "scipy >=1.4,<1.15.0a0"
osx-64::anndata-0.8.0-py37hf985489_0.tar.bz2
-    "scipy >=1.4",
+    "scipy >=1.4,<1.15.0a0",

Note that the anndata history of being a noarch recipe is complex, hence the arch-specific binaries with modified repodata for these earlier versions:

@h-vetinari h-vetinari merged commit 4ae32e6 into conda-forge:main Jan 9, 2025
3 checks passed
@jdblischak jdblischak deleted the anndata-scipy-1.15 branch January 9, 2025 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants