Skip to content

Commit b43102c

Browse files
committed
Defer to install_requirement.py in beeware/.github
1 parent 25070c1 commit b43102c

4 files changed

Lines changed: 13 additions & 203 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,11 @@ jobs:
8282
name: ${{ needs.package.outputs.artifact-name }}
8383
path: dist
8484

85-
- name: Install dev Dependencies
86-
run: |
87-
python -m pip install --upgrade pip
88-
python -m pip install --upgrade setuptools build wheel
89-
# Utility script installs tox as defined in pyproject.toml
90-
python -m install_requirement tox --extra dev
85+
- name: Install Tox
86+
uses: beeware/.github/.github/actions/install-requirement@main
87+
with:
88+
requirements: tox
89+
extra: dev
9190

9291
- name: Test
9392
id: test
@@ -129,12 +128,11 @@ jobs:
129128
# https://github.com/nedbat/coveragepy/issues/1572#issuecomment-1522546425
130129
python-version: "3.8"
131130

132-
- name: Install dev Dependencies
133-
run: |
134-
python -m pip install --upgrade pip
135-
python -m pip install --upgrade setuptools build wheel
136-
# Utility script installs tox as defined in pyproject.toml
137-
python -m install_requirement tox --extra dev
131+
- name: Install Tox
132+
uses: beeware/.github/.github/actions/install-requirement@main
133+
with:
134+
requirements: tox
135+
extra: dev
138136

139137
- name: Retrieve Coverage Data
140138
uses: actions/download-artifact@v4.1.7

changes/1847.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The ``install_requirement.py`` script was removed.

install_requirement.py

Lines changed: 0 additions & 179 deletions
This file was deleted.

tox.ini

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ labels =
3131
skip_missing_interpreters = True
3232

3333
[testenv:pre-commit]
34-
skip_install = True
35-
deps =
36-
build==1.2.1
37-
setuptools==70.0.0
38-
wheel==0.43.0
39-
commands_pre = python -m install_requirement pre-commit --extra dev --project-root "{tox_root}"
34+
extras = dev
4035
commands = pre-commit run --all-files --show-diff-on-failure --color=always
4136

4237
[testenv:py{,38,39,310,311,312,313}{,-fast,-cov}]
@@ -55,7 +50,6 @@ commands =
5550

5651
[testenv:coverage{,38,39,310,311,312,313}{,-ci}{,-platform,-platform-linux,-platform-macos,-platform-windows,-project}{,-keep}{,-html}]
5752
depends = pre-commit,py{,38,39,310,311,312,313}{,-cov}
58-
skip_install = True
5953
# by default, coverage should run on oldest supported Python for testing platform coverage.
6054
# however, coverage for a particular Python version should match the version used for pytest.
6155
base_python =
@@ -81,13 +75,9 @@ setenv =
8175
{platform,project}: COVERAGE_EXCLUDE_PYTHON_VERSION=disable
8276
# disable conditional coverage exclusions for host platform to test entire project
8377
project: COVERAGE_EXCLUDE_PLATFORM=disable
84-
deps =
85-
build==1.2.1
86-
setuptools==70.0.0
87-
wheel==0.43.0
78+
extras = dev
8879
commands_pre =
8980
python --version
90-
python -m install_requirement coverage coverage-conditional-plugin --extra dev --project-root "{tox_root}"
9181
commands =
9282
-python -m coverage combine {env:COMBINE_FLAGS}
9383
html: python -m coverage html --skip-covered --skip-empty

0 commit comments

Comments
 (0)