-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Port requirements to PEP735 #29281
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
base: main
Are you sure you want to change the base?
Port requirements to PEP735 #29281
Conversation
Note, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was curious about this new PEP, so I took a look through the changes. I think this would be a really neat feature when pip implements it. I know this is just a draft, but I figured I can point out a couple things I noticed, and I had a couple of questions, too.
azure-pipelines.yml
Outdated
@@ -71,8 +71,7 @@ stages: | ||
|
||
- bash: | | ||
python -m pip install --upgrade pip | ||
python -m pip install --upgrade -r requirements/dev/build-requirements.txt | ||
python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt | ||
python -m pip install --group build --group test --group test-extra |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll have to see if it matters whether or not we were upgrading certain dependencies or not. I suspect not.
pyproject.toml
Outdated
|
||
# Extra pip requirements for the Python 3.10+ builds | ||
test-extra = [ | ||
"--prefer-binary", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will command-line arguments and sys.platform
references work in this PEP? It isn't entirely clear to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, the command-line argument probably won't, but we'll have to see how the pip
implementation ends up. The sys.platform
should work as these are standard dependency specifiers.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I learned something new! Neat!
@@ -51,7 +51,7 @@ jobs: | ||
python-version: '3.10' | ||
|
||
- name: Install mypy | ||
run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt | ||
run: pip3 install --group typing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this also need group "test"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm hoping not, so we can reduce the install set.
pyproject.toml
Outdated
# | ||
# You will first need a matching Matplotlib installation | ||
# e.g (from the Matplotlib root directory) | ||
# pip install --no-build-isolation --editable .[dev] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the .[dev]
correct? Or should it be just .
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The [dev]
is an extra, not a dependency group. It was intended to cover both build and runtime dependencies. It didn't really work though, as pip
installed .
before its dependencies, so you couldn't get the build ones early enough. Based on the other implementations, dependency groups should be strictly better, since they should install before .
, but we'll have to see how it's finally implemented. I should probably rewrite this section a bit once that's finalized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I see. I'm not used to seeing an extra be specified against a directory, so I thought it was a typo. And, yeah, extras wouldn't work for installing dependencies.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No more .[dev]
now.
0b93f55
to
8ef2f01
Compare
I rebased and fixed the comments. |
2fe2177
to
5803913
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also going to require pip >= 25.1
for anyone developing Matplotlib - that should at least go in some sort of release note/changelog entry, and be noted in the development setup docs.
@@ -50,12 +50,12 @@ jobs: | ||
- name-suffix: "(Minimum Versions)" | ||
os: ubuntu-22.04 | ||
python-version: '3.11' | ||
extra-requirements: '-c requirements/testing/minver.txt' | ||
extra-requirements: 'python -m pip install --upgrade $PRE --group test-minver' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the addition of $PRE
here?
python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt | ||
python -m pip install --upgrade --group build | ||
python -m pip install --group test | ||
python -m pip install --prefer-binary --group test-extra |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Worth a comment explaining the reason for using --prefer-binary
just for test-extra
?
{include-group = "doc"}, | ||
{include-group = "test"}, | ||
{include-group = "test-extra"}, | ||
"ruff", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pre-commit
should be added here, and perhaps ruff
dropped since running pre-commit runs ruff.
"types-python-dateutil", | ||
"types-psutil", | ||
"sphinx", | ||
{include-group = "build"}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given the doc
and test
groups dont' depend on build
, I don't think typing
should either, and the build
group can be additionally specified during the CI install stage.
PR summary
PEP735 introduces the concept of "Dependency Groups"; these essentially replace our use of various
requirements.txt
files.NOTE: This is waiting for
pip
to actually implement Dependency Groups: pypa/pip#12963 We may or may not wish to wait for that to bake a bit even after it's been implemented as well.PR checklist