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

Hypothesis hotfix exclusion #237

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Conversation

JamesRobertsonGames
Copy link
Contributor

@JamesRobertsonGames JamesRobertsonGames commented Aug 19, 2024

  • Corrected the NumPy2 hotfix: Adjusted the hotfix to allow specific patches to be excluded, providing more control over which patches are applied.
  •   Created the logic for hypothesis 6.111.0 to not be affected by this script 
    

@@ -1765,26 +1765,6 @@
"original": "numpy >=1.15",
"updated": "numpy >=1.15,<2.0a0"
},
"hypothesis-6.100.1-py310h06a4308_0.tar.bz2": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Hypothesis introduced support for numpy 2 in 6.100.2. So I think we still need the upper bound on 6.100.1.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah just saw your message, we're going to have to build a newer version for defaults anyway so will swing back to getting a newer version on defaults

Copy link
Contributor

Choose a reason for hiding this comment

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

If I understand correctly, we shouldn't need to run the generate patch a lot anymore. Anything using numpy currently that is updated SHOULD put these protections in place. Going forward, we should only need to remove from the .json file as needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Absolutely agree, this is for a very small subsection during this period of transition and for any important packages that may not have active maintainers

Copy link
Contributor

Choose a reason for hiding this comment

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

Good call. Let's get this in!

Copy link
Contributor

@ryanskeith ryanskeith left a comment

Choose a reason for hiding this comment

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

These changes look good to me.

@JeanChristopheMorinPerso
Copy link
Contributor

@JamesRobertsonGames Why is the diff in the tests so big and full or R stuff?

@JamesRobertsonGames
Copy link
Contributor Author

@JamesRobertsonGames Why is the diff in the tests so big and full or R stuff?

Not sure what this means @JeanChristopheMorinPerso ? There isn't a diff in tests or any relation to R stuff? The code changes are to reflect the oversights in the implementation of the protection dict which was untested at the time of deployment

@JamesRobertsonGames
Copy link
Contributor Author

JamesRobertsonGames commented Aug 20, 2024

Oh I see what you mean now. It seems to happen in all the PRs which is strange but uniform behaviour

https://github.com/AnacondaRecipes/repodata-hotfixes/actions/runs/10308588189/job/28536351183?pr=235#step:6:1603

My code doesn't actually currently impact the hotfix code at all and is not run at all, so we can be 100% confident this is normal behavior (to run the N2 hotfix it spits out a JSON file to be ingested to make the changes at bulk, this has not changed at all)

@JamesRobertsonGames
Copy link
Contributor Author

@JeanChristopheMorinPerso just want to check your thoughts on the logs with this information inline?

Oh I see what you mean now. It seems to happen in all the PRs which is strange but uniform behaviour

https://github.com/AnacondaRecipes/repodata-hotfixes/actions/runs/10308588189/job/28536351183?pr=235#step:6:1603

My code doesn't actually currently impact the hotfix code at all and is not run at all, so we can be 100% confident this is normal behavior (to run the N2 hotfix it spits out a JSON file to be ingested to make the changes at bulk, this has not changed at all)

@JamesRobertsonGames
Copy link
Contributor Author

JC approved verbally in a meeting so 2 approvals in

@JamesRobertsonGames JamesRobertsonGames merged commit 2e4beda into master Aug 21, 2024
2 checks passed
@JamesRobertsonGames JamesRobertsonGames deleted the numpy-2-hypothesis-fix branch August 21, 2024 14:56
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