Port requirements to PEP735 #29281
Port requirements to PEP735 #29281
Conversation
|
Note, |
There was a problem hiding this comment.
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.
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.
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.
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.
I learned something new! Neat!
There was a problem hiding this comment.
So unfortunately, we can't keep --prefer-binary here, so I've moved it to the CI invocation.
.github/workflows/reviewdog.yml
Outdated
| @@ -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.
does this also need group "test"?
There was a problem hiding this comment.
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.
Is the .[dev] correct? Or should it be just .?
There was a problem hiding this comment.
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.
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.
0b93f55 to
8ef2f01
Compare
|
I rebased and fixed the comments. |
5803913 to
6770028
Compare
.github/workflows/tests.yml
Outdated
| @@ -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.
Why the addition of $PRE here?
There was a problem hiding this comment.
This was always used: https://github.com/matplotlib/matplotlib/pull/29281/files#diff-1db27d93186e46d3b441ece35801b244db8ee144ff1405ca27a163bfe878957fL218
But I've changed this line a bit to not require the full invocation.
azure-pipelines.yml
Outdated
| 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.
Worth a comment explaining the reason for using --prefer-binary just for test-extra?
There was a problem hiding this comment.
This came from the original file: https://github.com/matplotlib/matplotlib/pull/29281/files#diff-1823d2c36efddd45c3c2fa83d0fa74b23c3559ee9ceb371d4dfcb14372d9efaeL3
But I'm actually unsure if it's applied to only the requirements file that contained it, or the entire command-line.
There was a problem hiding this comment.
Looking at https://pip.pypa.io/en/stable/reference/requirements-file-format/#global-options it is global, so I'm going to add it on all calls.
pyproject.toml
Outdated
| {include-group = "doc"}, | ||
| {include-group = "test"}, | ||
| {include-group = "test-extra"}, | ||
| "ruff", |
There was a problem hiding this comment.
pre-commit should be added here, and perhaps ruff dropped since running pre-commit runs ruff.
pyproject.toml
Outdated
| "types-python-dateutil", | ||
| "types-psutil" F438 , | ||
| "sphinx", | ||
| {include-group = "build"}, |
There was a problem hiding this comment.
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.
|
Added a few notes for the pip 25.1 requirement. |
PR summary
PEP735 introduces the concept of "Dependency Groups"; these essentially replace our use of various
requirements.txtfiles.NOTE: This is waiting for
pipto 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