Skip to content

Fix CI: pin to 3.14 where needed, update tox usage #749

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
sirosen merged 3 commits into from
Nov 4, 2026
+10 −4
Merged

Fix CI: pin to 3.14 where needed, update tox usage #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
045281a
Pin CI to 3.14 where needed
sirosen Nov 3, 2026
d3b389c
Fix tox ci label targets
sirosen Nov 3, 2026
0e02e28
Improve CI verbosity and fix tox var expansion
sirosen Nov 4, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
persist-credentials: false
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: "3.x"
# mddj does not yet support 3.15; use 3.14 for now
python-version: "3.14"
- uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0

- parallel:
Expand Down Expand Up @@ -82,7 +83,7 @@ jobs:

- name: test
run: |
tox run -m ci -- --junitxml pytest.{envname}.xml
tox run -m ci
tox run -e cov_combine,cov_report

- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
Expand Down
4 changes: 4 additions & 0 deletions scripts/aggregate-pytest-reports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ def main():
nodename = f"{classname.replace('.', '/')}.py::{name}"
if skip_node is not None:
if "skipped" not in tests_by_name[nodename]:
print(f"found first skip of {nodename} in {filename}")
tests_by_name[nodename]["skipped"] = True
else:
print(f"found first run of {nodename} in {filename}")
tests_by_name[nodename]["skipped"] = False
else:
if skip_node is not None:
skipped_module_counts[name] += 1

print("-- tally results")

skipped_modules = {
modname
for modname, count in skipped_module_counts.items()
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ skip_missing_interpreters = true
minversion = 4.0.0

labels =
ci = py, py-notoml, py-tomli-format, py-json5, py-pyjson5
ci = py-ci, py-format-ci, py-json5-ci, py-pyjson5-ci

[testenv]
description = "run tests with pytest"
Expand All @@ -31,7 +31,8 @@ deps =
pyjson5: pyjson5
format: jsonschema[format]
commands =
coverage run -m pytest {posargs:--junitxml={envdir}/pytest.xml}
!ci: coverage run -m pytest {posargs:--junitxml={envdir}/pytest.xml}
ci: coverage run -m pytest -v --junitxml pytest.{envname}.xml
depends = cov_clean

[testenv:cov_clean]
Expand Down
Loading