diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82227e8e7b..5709c5685b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,8 @@ concurrency: # - django 4.1, python 3.10, mysql # - django 4.0, python 3.10, postgres, USE_EMAIL_USER_MODEL=yes # - django 4.1, python 3.11, postgres, DISABLE_TIMEZONE=yes -# - django stable/4.1.x, python 3.10, postgres (allow failures) -# - django stable/4.1.x, python 3.11, mysql (allow failures) +# - django stable/4.2.x, python 3.10, postgres (allow failures) +# - django stable/4.2.x, python 3.11, mysql (allow failures) # - django main, python 3.10, postgres (allow failures) # - elasticsearch 5, django 3.2, python 3.7, sqlite # - elasticsearch 6, django 3.2, python 3.7, postgres @@ -86,7 +86,7 @@ jobs: experimental: false emailuser: emailuser - python: '3.10' - django: 'git+https://github.com/django/django.git@stable/4.1.x#egg=Django' + django: 'git+https://github.com/django/django.git@stable/4.2.x#egg=Django' experimental: true postgres: 'postgres:12' - python: '3.10' @@ -145,7 +145,7 @@ jobs: django: 'Django>=4.1,<4.2' experimental: false - python: '3.11' - django: 'git+https://github.com/django/django.git@stable/4.1.x#egg=Django' + django: 'git+https://github.com/django/django.git@stable/4.2.x#egg=Django' experimental: true services: diff --git a/tox.ini b/tox.ini index 4d4b939130..d329b9234b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ skipsdist = True usedevelop = True -envlist = py{37,38,39,310,311}-dj{32,40,41,41stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz}, +envlist = py{37,38,39,310,311}-dj{32,40,41,42stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz}, [testenv] install_command = pip install -e ".[testing]" -U {opts} {packages} @@ -26,7 +26,7 @@ deps = dj32: Django~=3.2.0 dj40: Django~=4.0.0 dj41: Django~=4.1.0 - dj41stable: git+https://github.com/django/django.git@stable/4.1.x#egg=Django + dj42stable: git+https://github.com/django/django.git@stable/4.2.x#egg=Django djmain: git+https://github.com/django/django.git@main#egg=Django postgres: psycopg2>=2.6