From a0de60b1ea99a896e105b6c1c29c2c38baa8d132 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 29 Jun 2022 10:18:41 +0100 Subject: [PATCH] Test against Django stable/4.1.x branch (#8774) * Test against Django stable/4.1.x branch * Use postgres 12 for stable/4.1.x --- .github/workflows/test.yml | 5 +++-- tox.ini | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6dbf2091db..1578742125 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ concurrency: # - django 4.0, python 3.9, mysql # - django 4.0, python 3.10, postgres, USE_EMAIL_USER_MODEL=yes # - django 4.0, python 3.10, postgres, DISABLE_TIMEZONE=yes -# - django stable/4.0.x, python 3.10, postgres (allow failures) +# - django stable/4.1.x, python 3.10, postgres (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 @@ -77,8 +77,9 @@ jobs: experimental: false emailuser: emailuser - python: '3.10' - django: 'git+https://github.com/django/django.git@stable/4.0.x#egg=Django' + django: 'git+https://github.com/django/django.git@stable/4.1.x#egg=Django' experimental: true + postgres: 'postgres:12' - python: '3.10' django: 'git+https://github.com/django/django.git@main#egg=Django' experimental: true diff --git a/tox.ini b/tox.ini index 6e42eabed7..4c3f925e2f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ skipsdist = True usedevelop = True -envlist = py{37,38,39,310}-dj{32,40,40stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz}, +envlist = py{37,38,39,310}-dj{32,40,41stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz}, [testenv] install_command = pip install -e ".[testing]" -U {opts} {packages} @@ -24,7 +24,7 @@ deps = dj32: Django~=3.2.0 dj40: Django~=4.0.0 - dj40stable: git+https://github.com/django/django.git@stable/4.0.x#egg=Django + dj41stable: git+https://github.com/django/django.git@stable/4.1.x#egg=Django djmain: git+https://github.com/django/django.git@main#egg=Django postgres: psycopg2>=2.6