Skip to content

Commit

Permalink
Ensure setuptools and wheel installed for install_requirement.py
Browse files Browse the repository at this point in the history
  • Loading branch information
rmartin16 committed Nov 5, 2023
1 parent 8e41297 commit de740c5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
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
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

0 comments on commit de740c5

Please sign in to comment.