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.

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

Clean up setuptools and wheel requirements to align with PEP-518 #2927

Merged
merged 10 commits into from
Aug 18, 2023
3 changes: 0 additions & 3 deletions .circleci/continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ commands:

setup_requirements:
steps:
- run:
name: Install pip setuptools
command: make install-pip-setuptools
- run:
name: Install venv for some pre-commit hooks
command: conda install -y virtualenv
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
uses: actions/setup-python@v3
with:
python-version: ${{inputs.python-version}}
- run: make install-pip-setuptools
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pip-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
uses: actions/setup-python@v3
with:
python-version: ${{inputs.python-version}}
- run: make install-pip-setuptools
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
uses: actions/setup-python@v3
with:
python-version: ${{inputs.python-version}}
- run: make install-pip-setuptools
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ clean:
find . -regex ".*\.egg-info" -exec rm -rf {} +
pre-commit clean || true

install-pip-setuptools:
python -m pip install -U "pip>=21.2, <23.2" "setuptools>=65.5.1" wheel

lint:
pre-commit run -a --hook-stage manual $(hook)
test:
Expand Down
2 changes: 0 additions & 2 deletions features/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ def _setup_minimal_env(context):
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
"pip>=21.2,<23.2; python_version < '3.8'",
"pip>=21.2; python_version >= '3.8'",
"setuptools>=65.5.1",
"wheel",
],
env=context.env,
)
Expand Down
1 change: 0 additions & 1 deletion tools/circleci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
pip>=21.2
setuptools>=65.5.1
twine~=3.0