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

Ensure setuptools and wheel installed for install_requirement.py #1526

Merged
merged 1 commit into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools build wheel
# Utility script installs tox as defined in pyproject.toml
python -m install_requirement --extra dev tox
python -m install_requirement tox --extra dev

- name: Test
id: test
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools build wheel
# Utility script installs tox as defined in pyproject.toml
python -m install_requirement --extra dev tox
python -m install_requirement tox --extra dev

- name: Retrieve Coverage Data
uses: actions/download-artifact@v3.0.2
Expand Down
1 change: 1 addition & 0 deletions changes/1526.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The ``setuptools`` and ``build`` packages are always installed prior to running ``install_requirement.py`` now.
4 changes: 4 additions & 0 deletions install_requirement.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
#
# Therefore, this script will evaluate the requirements defined in the project's
# metadata and install the ones matching those being requested to be installed.
#
# Dependencies
# ------------
# The ``build``, ``setuptools``, and ``wheel`` packages must be installed to run.

from __future__ import annotations

Expand Down
9 changes: 6 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ skip_missing_interpreters = True

[testenv:pre-commit]
skip_install = True
deps = build
commands_pre = python -m install_requirement --extra dev --project-root "{tox_root}" pre-commit
deps =
build
setuptools
wheel
commands_pre = python -m install_requirement pre-commit --extra dev --project-root "{tox_root}"
commands = pre-commit run --all-files --show-diff-on-failure --color=always

[testenv:py{,38,39,310,311,312}{,-fast}]
Expand Down Expand Up @@ -64,7 +67,7 @@ deps =
wheel
commands_pre =
python --version
python -m install_requirement --extra dev --project-root "{tox_root}" coverage coverage-conditional-plugin
python -m install_requirement coverage coverage-conditional-plugin --extra dev --project-root "{tox_root}"
commands =
-python -m coverage combine {env:COMBINE_FLAGS}
html: python -m coverage html --skip-covered --skip-empty
Expand Down