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.

Sign up for GitHub

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

Jump to bottom

Add trove-classifiers>=2024.10.12 to 'tests' extra and use for Windows CI #8514

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Add trove-classifiers>=2024.10.12 to 'tests' extra and use for Windows CI #8514

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67c2e04
Add trove-classifiers>=2024.10.12 to 'tests' extra and use for Window…
hugovk Oct 30, 2024
0bf15f0
Upgrade pip
hugovk Oct 30, 2024
5628213
Upgrade pip for all
hugovk Nov 4, 2024
b11aec3
Merge branch 'main' into tests-trove-extra
radarhere Nov 6, 2024
042f3ff
Require coverage>=7.4.2
radarhere Nov 6, 2024
e5f2874
Require coverage>=7.4.2 (#129)
hugovk Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,11 @@ jobs:
- name: Print build system information
run: python3 .github/workflows/system-info.py

- name: Install Python dependencies
run: >
python3 -m pip install
coverage>=7.4.2
Copy link
Member

Choose a reason for hiding this comment

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

Just to call it out, there is a difference between this and

Pillow/pyproject.toml

Lines 57 to 59 in 82199ef

optional-dependencies.tests = [
"check-manifest",
"coverage",

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep.

  • coverage vs coverage>=7.4.2: before, theoretically we could have installed coverage older than 7.4.2 here. I think that was unlikely and it's safer to require the newer version.

  • check-manifest: we don't need that here. I see little harm in installing it here. It's in the tests extra because it's used by make release-test. If we do want to keep this env "cleaner", we could remove it from the tests extra and put it in something like a release-test extra.

Relatedly, PEP 735 was accepted recently to define something called "dependency groups". These are like extras, but you can install a dependency group without having to also install Pillow as well.

tox and some other tools already support it, but not yet pip. We could look into using it when pip is ready.

defusedxml
olefile
pyroma
pytest
pytest-cov
pytest-timeout

- name: Install CPython dependencies
if: "!contains(matrix.python-version, 'pypy')"
run: >
python3 -m pip install
PyQt6
run: |
python3 -m pip install --upgrade pip
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not run on PyPy, only CPython. Maybe that is causing the issue?

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's see! It makes sense to upgrade for both anyway.

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, passing now, thanks :)

python3 -m pip install PyQt6

- name: Install dependencies
id: install
Expand Down Expand Up @@ -184,7 +173,7 @@ jobs:
- name: Build Pillow
run: |
$FLAGS="-C raqm=vendor -C fribidi=vendor"
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ."
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]"
& $env:pythonLocation\python.exe selftest.py --installed
shell: pwsh

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ optional-dependencies.tests = [
"pytest",
"pytest-cov",
"pytest-timeout",
"trove-classifiers>=2024.10.12",
]
optional-dependencies.typing = [
"typing-extensions; python_version<'3.10'",
Expand Down
Loading