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

Defer to install_requirement.py in beeware/.github #1847

Merged
merged 2 commits into from
May 29, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.

18 changes: 6 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@ 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}"
package = wheel
wheel_build_env = .pkg
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 All @@ -54,8 +51,9 @@ commands =
fast : python -m pytest {posargs:-vv --color yes -n auto}

[testenv:coverage{,38,39,310,311,312,313}{,-ci}{,-platform,-platform-linux,-platform-macos,-platform-windows,-project}{,-keep}{,-html}]
package = wheel
wheel_build_env = .pkg
depends = pre-commit,py{,38,39,310,311,312,313}{,-cov}
skip_install = True
# by default, coverage should run on oldest supported Python for testing platform coverage.
# however, coverage for a particular Python version should match the version used for pytest.
base_python =
Expand All @@ -81,13 +79,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