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

examples: remove requirements-dev.txt files #3536

Merged
merged 1 commit into from
Oct 29, 2023

Conversation

davidhewitt
Copy link
Member

While reviewing #3508 and #3052 we've noticed that we have a bit of duplication of maturin requirements as well as some inconsistency in how we install / pin maturin versions in the examples.

This PR attempts to fix that by removing the requirements-dev.txt files, and moving any "dev" requirements as optional dependencies in the pyproject.toml files. Finally, the noxfiles are changed to use --config-settings to pass arguments to maturin in a PEP517 install rather than by calling maturin develop, meaning those calls also go through the maturin version configured in the pyproject.toml.

Copy link
Member Author

Choose a reason for hiding this comment

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

Dead file no longer needed.

@@ -1,3 +1,4 @@
variable::set("PYO3_VERSION", "0.20.0");
file::rename(".template/Cargo.toml", "Cargo.toml");
file::rename(".template/pyproject.toml", "pyproject.toml");
Copy link
Member Author

Choose a reason for hiding this comment

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

This was missing from the template, thought I would fix at the same time while touching up these examples.

@davidhewitt davidhewitt added the CI-skip-changelog Skip checking changelog entry label Oct 20, 2023
@davidhewitt
Copy link
Member Author

@adamreichold I'm going to assume this is good to merge now that I switched to use the MATURIN_PEP517_ARGS environment variable. If not, please ping and I can push follow ups / revert!

@davidhewitt davidhewitt added this pull request to the merge queue Oct 29, 2023
Copy link
Member

@adamreichold adamreichold left a comment

Choose a reason for hiding this comment

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

Sorry, just lost this from my to-do list.

Merged via the queue into PyO3:main with commit 7a2c63d Oct 29, 2023
34 checks passed
@davidhewitt davidhewitt deleted the maturin-build-args branch October 29, 2023 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-skip-changelog Skip checking changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants