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.

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

Upgrade to actions/upload-artifact@v4; fix testing matrix #415

Merged
merged 5 commits into from
Feb 6, 2025
+16 −18
Merged

Upgrade to actions/upload-artifact@v4; fix testing matrix #415

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a34eae6
Upgrade to `actions/upload-artifact@v4`
mgax Feb 6, 2025
a2cb8f9
Remove Py38 from testing matrix
mgax Feb 6, 2025
e985ca4
Pin Wagtail version more closely
mgax Feb 6, 2025
fdfd1f3
Don't upgrade packages; update matrix
mgax Feb 6, 2025
f69badb
Simplify tox configuration
mgax Feb 6, 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
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.9', '3.10', '3.11', '3.12']
db: ['sqlite']

steps:
Expand All @@ -50,9 +50,9 @@ jobs:
run: tox --installpkg ./dist/*.whl

- name: ⬆️ Upload coverage data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-data
name: coverage-data-${{ matrix.python-version }}-${{ matrix.db }}
path: tests/.coverage*
if-no-files-found: ignore
retention-days: 1
Expand All @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.9', '3.10', '3.11', '3.12']
db: ['postgres']

services:
Expand Down Expand Up @@ -100,9 +100,9 @@ jobs:
run: tox --installpkg ./dist/*.whl

- name: ⬆️ Upload coverage data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-data
name: coverage-data-${{ matrix.python-version }}-${{ matrix.db }}
path: tests/.coverage*
if-no-files-found: ignore
retention-days: 1
Expand All @@ -122,9 +122,10 @@ jobs:
- run: python -Im pip install --upgrade coverage[toml]

- name: ⬇️ Download coverage data
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage-data
pattern: coverage-data-*
merge-multiple: true

- name: ＋ Generate report
run: |
Expand All @@ -133,7 +134,7 @@ jobs:
echo "## Coverage summary" >> $GITHUB_STEP_SUMMARY
python -Im coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
- name: 📈 Upload HTML report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: html-report
path: htmlcov
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Build
run: python -Im flit build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./dist

Expand All @@ -43,7 +43,7 @@ jobs:
# Mandatory for trusted publishing
id-token: write
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4

- name: 🚀 Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruff==0.0.287

# Runtime requirements
Django>=4.2,<5.1
wagtail>=4.1
wagtail>=5.2,<6.3
graphene-django>=3.0.0
factory-boy==3.2.1
wagtail-factories>=4.1.0
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
min_version = 4.0

envlist =
py{38,39,310,311,312}-django{42}-wagtail{52,60}
py{310,311,312}-django{50}-wagtail{52,60}
py{38,39,310,311,312}-django{42}-wagtail{62}
py{310,311,312}-django{50}-wagtail{62}
zerolab marked this conversation as resolved.
Show resolved Hide resolved
interactive

[gh-actions]
Expand Down Expand Up @@ -47,9 +47,11 @@ deps =
django50: Django>=5.0,<5.1
wagtail52: wagtail>=5.2,<6.0
wagtail60: wagtail>=6.0,<6.1
wagtail61: wagtail>=6.1,<6.2
zerolab marked this conversation as resolved.
Show resolved Hide resolved
wagtail62: wagtail>=6.2,<6.3
interactive: wagtail>=5.2

install_command = python -Im pip install -U {opts} {packages}
install_command = python -Im pip install {opts} {packages}
zerolab marked this conversation as resolved.
Show resolved Hide resolved

commands =
python -m coverage run manage.py test {posargs: -v1} --exclude-tag=needs-custom-settings
Expand Down
Loading