Skip to content

A few more CI/tox tweaks #13948

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 12, 2025
Merged

A few more CI/tox tweaks #13948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74d49d2
tox: remove unneeded `xdist: -e .`
bluetech Nov 12, 2025
7c581d5
tox: remove no longer needed `pip` download=True
bluetech Nov 12, 2025
bb20945
ci,tox: generate coverage xml in tox, not in CI
bluetech Nov 12, 2025
1afe0ae
ci: remove unneeded `setuptools` install
bluetech Nov 12, 2025
5bc8de2
ci: be consistent in how we install tox
bluetech Nov 12, 2025
665363a
ci: replace SETUPTOOLS_SCM_PRETEND_VERSION -> FOR_PYTEST
bluetech Nov 12, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
package:
runs-on: ubuntu-latest
env:
SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST: ${{ github.event.inputs.version }}
timeout-minutes: 10

# Required by attest-build-provenance-github.
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install --upgrade tox
pip install tox
Comment on lines 57 to +58
Copy link
Member

@webknjaz webknjaz Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I'd skip pip and have the entire env with tox pinned via --constraint=.

Copy link
Member Author

@bluetech bluetech Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with this, how to skip pip but still get tox installed?

Copy link
Member

@webknjaz webknjaz Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant skip the previous line and have constraint on this one.

Copy link
Member

@webknjaz webknjaz Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although, technically pipx is pre-installed so this could be skipped if there's no desire to pin the env.


- name: Generate release notes
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-check-links.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
python-version: "3.13"
cache: pip

- name: Install dependencies
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install tox
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:
with:
python-version: "3.13"

- name: Install dependencies
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install --upgrade setuptools tox
pip install tox

- name: Prepare release PR (minor/patch release)
if: github.event.inputs.major == 'no'
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,10 @@ jobs:
check-latest: true
allow-prereleases: true

- name: Install dependencies
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install tox coverage
pip install tox

- name: Test without coverage
if: "! matrix.use_coverage"
Expand All @@ -283,10 +283,6 @@ jobs:
shell: bash
run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`

- name: Generate coverage report
if: "matrix.use_coverage"
run: python -m coverage xml

- name: Upload coverage to Codecov
if: "matrix.use_coverage"
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-plugin-list.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install --upgrade tox
pip install tox

- name: Update Plugin List
run: tox -e update-plugin-list
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ commands =
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
coverage: coverage combine
coverage: coverage report -m
# Run `coverage xml` only on CI.
coverage: python -c 'import os; os.environ.get("CI") and os.execlp("coverage", "coverage", "xml")'
passenv =
COVERAGE_*
PYTEST_ADDOPTS
Expand Down Expand Up @@ -108,7 +110,6 @@ deps =
twisted25: twisted>=25
asynctest: asynctest
xdist: pytest-xdist>=2.1.0
xdist: -e .
# Can use the same wheel for all environments.
package = wheel
wheel_build_env = .pkg
Expand Down Expand Up @@ -174,9 +175,6 @@ description =
run reverse dependency testing against pytest plugins under `{basepython}`
# use latest versions of all plugins, including pre-releases
pip_pre=true
Copy link
Member

@webknjaz webknjaz Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bluetech I'd probably also delete --pre.

Copy link
Member Author

@bluetech bluetech Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's intentional per the comment above it.

# use latest pip to get new dependency resolver (#7783)
download=true
install_command=python -m pip install {opts} {packages}
changedir = testing/plugins_integration
deps = -rtesting/plugins_integration/requirements.txt
setenv =
Expand Down