Skip to content

Commit

Permalink
Defer to install_requirement.py in beeware/.github
Browse files Browse the repository at this point in the history
  • Loading branch information
rmartin16 committed May 28, 2024
1 parent 25070c1 commit 45216b4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 202 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,11 @@ jobs:
name: ${{ needs.package.outputs.artifact-name }}
path: dist

- name: Install dev Dependencies
run: |
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 tox --extra dev
- name: Install Tox
uses: beeware/.github/.github/actions/install-requirement@main
with:
requirements: tox
extra: dev

- name: Test
id: test
Expand Down Expand Up @@ -129,12 +128,11 @@ jobs:
# https://github.com/nedbat/coveragepy/issues/1572#issuecomment-1522546425
python-version: "3.8"

- name: Install dev Dependencies
run: |
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 tox --extra dev
- name: Install Tox
uses: beeware/.github/.github/actions/install-requirement@main
with:
requirements: tox
extra: dev

- name: Retrieve Coverage Data
uses: actions/download-artifact@v4.1.7
Expand Down
1 change: 1 addition & 0 deletions changes/1847.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The ``install_requirement.py`` script was removed.
179 changes: 0 additions & 179 deletions install_requirement.py

This file was deleted.

13 changes: 2 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ labels =
skip_missing_interpreters = True

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

[testenv:py{,38,39,310,311,312,313}{,-fast,-cov}]
Expand Down Expand Up @@ -81,13 +76,9 @@ setenv =
{platform,project}: COVERAGE_EXCLUDE_PYTHON_VERSION=disable
# disable conditional coverage exclusions for host platform to test entire project
project: COVERAGE_EXCLUDE_PLATFORM=disable
deps =
build==1.2.1
setuptools==70.0.0
wheel==0.43.0
extras = dev
commands_pre =
python --version
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 45216b4

Please sign in to comment.