Skip to content

Commit

Permalink
Test against Django stable/4.1.x branch (#8774)
Browse files Browse the repository at this point in the history
* Test against Django stable/4.1.x branch

* Use postgres 12 for stable/4.1.x
  • Loading branch information
gasman committed Jun 29, 2022
1 parent 2be5b82 commit a0de60b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down

0 comments on commit a0de60b

Please sign in to comment.