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

FIX: pin back modestimage's dependency on numpy to avoid removal #465

Merged
merged 2 commits into from
Jun 6, 2023

Conversation

tacaswell
Copy link
Contributor

Checklist

  • Ran python show_diff.py and posted the output as part of the PR.
  • Modifications won't affect packages built in the future.
✔ 17:19:45 $ python show_diff.py
Downloading: https://conda.anaconda.org/conda-forge/noarch/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/noarch/repodata.json.bz2
noarch::modestimage-0.2-pyhd8ed1ab_0.tar.bz2
-    "numpy",
+    "numpy <1.24",
noarch::modestimage-0.2-pyhd8ed1ab_1.tar.bz2
-    "numpy",
+    "numpy <1.24",
Downloading: https://conda.anaconda.org/conda-forge/linux-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-64/repodata.json.bz2
linux-64::graalpy-22.3.2-0_graalvm_native.conda
-  "track_features": "openjdk",
Downloading: https://conda.anaconda.org/conda-forge/linux-armv7l/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-armv7l/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-aarch64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-aarch64/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-ppc64le/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-ppc64le/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-64/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-arm64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-arm64/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-32/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-32/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-64/repodata.json.bz2

conda-forge/modestimage-feedstock#4 is PR to patch the feedstock.

@tacaswell tacaswell requested a review from a team as a code owner June 5, 2023 21:24
@conda-forge-webservices
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) and found it was in an excellent condition.

@@ -902,6 +902,13 @@ def _gen_new_index_per_key(repodata, subdir, index_key):
i = record['depends'].index('python >=3.6')
record['depends'][i] = 'python >=3.7'

# Need to patch modest image for numpy 1.24 removal of np.float
if (
record_name == "modestimage" and record['version'] == '0.2' and record['build'] in {'pyhd8ed1ab_0', 'pyhd8ed1ab_1' }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is probably an overkill b/c you are already patching specific build hashes but do you mind adding a and record.get('timestamp', 0) < timestamp here to avoid patching future incarnations of this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done (I think?) I just the int version of time.time() for the value, not sure if that is correct or not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We suggest python -c "import time; print(f'{time.time():.0f}000')" in the PR template to keep the numbers consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did something wildly wrong then as my time is 3 orders of magnitude smaller than the other numbers....

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did something wrong b/c I did not check it properly ;-p
No more merging on the cellphone for me :-)

@ocefpaf ocefpaf merged commit 04d71d2 into conda-forge:main Jun 6, 2023
@tacaswell tacaswell deleted the fix_modestimage_np124 branch June 6, 2023 17:45
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.

2 participants