◐ Shell
reader mode source ↗
Skip to content
Merged

Express conditional setuptools requirement statically #2043

Show file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
4 changes: 2 additions & 2 deletions .github/workflows/alpine-test.yml
View file Edit file Delete 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

- name: Install project and test dependencies
run: |
. .venv/bin/activate
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 Edit file Delete 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

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

- name: Show version and platform information
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pythonpackage.yml
View file Edit file Delete 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

- name: Install project and test dependencies
run: |
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]"
make -C doc html
12 changes: 9 additions & 3 deletions test/lib/helper.py
View file Edit file Delete 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")
subprocess.check_output(command)

@property
Expand Down
Loading
Toggle all file notes Toggle all file annotations