Skip to content

Express conditional setuptools requirement statically #2043

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

Merged
merged 2 commits into from
Jun 7, 2025
Merged

Express conditional setuptools requirement statically #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31e1c03
Use static notation for `setuptools` in installation test
EliahKagan Jun 7, 2025
727f4e9
Use static notation for `setuptools` in CI `pip` commands
EliahKagan Jun 7, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/alpine-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ jobs:
run: |
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
. .venv/bin/activate
python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel

- name: Install project and test dependencies
run: |
. .venv/bin/activate
pip install ".[test]"
pip install '.[test]'

- name: Show version and platform information
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cygwin-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ jobs:
- name: Update PyPA packages
run: |
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel

- name: Install project and test dependencies
run: |
pip install ".[test]"
pip install '.[test]'

- name: Show version and platform information
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pythonpackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ jobs:
- name: Update PyPA packages
run: |
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel

- name: Install project and test dependencies
run: |
pip install ".[test]"
pip install '.[test]'

- name: Show version and platform information
run: |
Expand Down Expand Up @@ -114,5 +114,5 @@ jobs:
- name: Documentation
if: matrix.python-version != '3.7'
run: |
pip install ".[doc]"
pip install '.[doc]'
make -C doc html
12 changes: 9 additions & 3 deletions test/lib/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,15 @@ def __init__(self, env_dir, *, with_pip):

if with_pip:
# The upgrade_deps parameter to venv.create is 3.9+ only, so do it this way.
command = [self.python, "-m", "pip", "install", "--upgrade", "pip"]
if sys.version_info < (3, 12):
command.append("setuptools")
command = [
self.python,
"-m",
"pip",
"install",
"--upgrade",
"pip",
'setuptools; python_version<"3.12"',
]
subprocess.check_output(command)

@property
Expand Down
Loading