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

Limit python and xarray version for imod<=0.18.1 #925

Merged
merged 5 commits into from
Dec 12, 2024

Conversation

JoerivanEngelen
Copy link
Contributor

@JoerivanEngelen JoerivanEngelen commented Dec 11, 2024

Checklist

  • Used a static YAML file for the patch if possible (instructions).
  • Only wrote code directly into generate_patch_json.py if absolutely necessary.
  • 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.

Results show diff:

================================================================================
================================================================================
linux-armv7l
================================================================================
================================================================================
win-32
================================================================================
================================================================================
linux-ppc64le
================================================================================
================================================================================
osx-arm64
================================================================================
================================================================================
linux-aarch64
================================================================================
================================================================================
noarch
noarch::imod-0.11.2-pyhd8ed1ab_0.tar.bz2
noarch::imod-0.11.3-pyhd8ed1ab_0.tar.bz2
noarch::imod-0.11.4-pyhd8ed1ab_0.tar.bz2
noarch::imod-0.11.5-pyhd8ed1ab_0.conda
noarch::imod-0.11.6-pyhd8ed1ab_0.conda
noarch::imod-0.12.0-pyhd8ed1ab_0.conda
noarch::imod-0.13.0-pyhd8ed1ab_0.conda
noarch::imod-0.13.1-pyhd8ed1ab_0.conda
noarch::imod-0.13.2-pyhd8ed1ab_0.conda
noarch::imod-0.14.0-pyhd8ed1ab_0.conda
noarch::imod-0.14.1-pyhd8ed1ab_0.conda
-    "xarray >=0.15",
+    "xarray >=0.15,<2024.10.0a0",
noarch::imod-0.10.0-py_0.tar.bz2
noarch::imod-0.10.1-py_0.tar.bz2
-    "xarray >=0.15"
+    "xarray >=0.15,<2024.10.0a0"
noarch::imod-0.6.1-py_0.tar.bz2
noarch::imod-0.7.0-py_0.tar.bz2
noarch::imod-0.7.1-py_0.tar.bz2
noarch::imod-0.8.0-py_0.tar.bz2
noarch::imod-0.9.0-py_0.tar.bz2
noarch::imod-0.9.0-py_1.tar.bz2
-    "xarray >=0.11"
+    "xarray >=0.11,<2024.10.0a0"
noarch::imod-0.15.0-pyhd8ed1ab_0.conda
noarch::imod-0.15.1-pyhd8ed1ab_0.conda
-    "python >=3.10",
+    "python >=3.10,<3.13.0a0",
-    "xarray >=0.15",
+    "xarray >=0.15,<2024.10.0a0",
noarch::imod-0.15.2-pyhd8ed1ab_0.conda
noarch::imod-0.15.3-pyhd8ed1ab_0.conda
noarch::imod-0.16.0-pyhd8ed1ab_0.conda
noarch::imod-0.17.0-pyhd8ed1ab_0.conda
noarch::imod-0.17.1-pyhd8ed1ab_0.conda
noarch::imod-0.17.2-pyhd8ed1ab_0.conda
noarch::imod-0.18.0-pyhd8ed1ab_0.conda
noarch::imod-0.18.1-pyhd8ed1ab_0.conda
-    "python >=3.10",
+    "python >=3.10,<3.13.0a0",
-    "xarray >=2023.08.0",
+    "xarray >=2023.08.0,<2024.10.0a0",
================================================================================
================================================================================
win-64
================================================================================
================================================================================
osx-64
================================================================================
================================================================================
linux-64

@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.

@JoerivanEngelen JoerivanEngelen changed the title Limit python and xarray version for imod Limit python and xarray version for imod<=0.18.1 Dec 11, 2024
@JoerivanEngelen JoerivanEngelen marked this pull request as ready for review December 11, 2024 10:54
@JoerivanEngelen JoerivanEngelen requested a review from a team as a code owner December 11, 2024 10:54
@ocefpaf
Copy link
Member

ocefpaf commented Dec 11, 2024

You need to fix that in the feedstock first, or the next build will also require a patch. See https://github.com/conda-forge/imod-feedstock/blob/main/recipe/meta.yaml#L57

@JoerivanEngelen
Copy link
Contributor Author

Thanks for the fast response, I didn't read the docs carefully enough so I missed that I had to update the feedstock recipe for future releases, but that makes complete sense. I've created a new build on the feedstock which is now merged. conda-forge/imod-feedstock#44 .

Is that sufficient to merge this PR and get the older versions patched as well?

@ocefpaf ocefpaf merged commit 16574a3 into conda-forge:main Dec 12, 2024
3 checks passed
@ocefpaf
Copy link
Member

ocefpaf commented Dec 12, 2024

Is that sufficient to merge this PR and get the older versions patched as well?

That is up to you. For "correctness" one could patch everything that is affected. However, we usually patch only the most used one/latest to avoid over patching.

@JoerivanEngelen JoerivanEngelen deleted the fix-imod-0.18.1 branch December 12, 2024 16:44
@JoerivanEngelen
Copy link
Contributor Author

Ah yes, good to see you are pragmatic about patching. Thanks for the quick response again and the merge!

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