Skip to content

Commit 4a74e11

Browse files
authored
Merge pull request #295 from agateblue/ci-improvements
CI Improvements
2 parents b69e4ad + a7a7c67 commit 4a74e11

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- '3.9'
2020
- '3.10'
2121
- '3.11'
22-
concurrency:
23-
group: ${{ github.workflow }}-${{ github.ref }}
2422
steps:
2523

2624
- uses: actions/checkout@v3

tox.ini

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[tox]
77
envlist =
88
{py37,py38,py39,py310}-django-32
9-
{py38,py39,py310}-django-41
10-
; {py37,py38,py39,py310}-django-master
9+
{py38,py39,py310,py311}-django-42
10+
{py311}-django-main
1111

1212

1313
[testenv]
@@ -16,10 +16,10 @@ setenv =
1616
PYTHONPATH = {toxinidir}
1717
commands = pytest --cov=dynamic_preferences {posargs}
1818
deps =
19-
django-{32,41,master}: djangorestframework>=3.13,<4
19+
django-{32,42,main}: djangorestframework>=3.13,<4
2020
django-32: Django>=3.2,<3.3
21-
django-41: Django>=4.1,<4.2
22-
django-master: https://github.com/django/django/archive/master.tar.gz
21+
django-42: Django>=4.2,<5.0
22+
django-main: https://github.com/django/django/archive/main.tar.gz
2323
-r{toxinidir}/requirements-test.txt
2424

2525

@@ -29,3 +29,6 @@ basepython =
2929
py39: python3.9
3030
py38: python3.8
3131
py37: python3.7
32+
33+
[testenv:py311-django-main]
34+
ignore_outcome = true

0 commit comments

Comments
 (0)