From a16cca3e8f0684d7a81acef236feb32d2eae9e56 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 9 Mar 2021 13:12:55 +0100 Subject: [PATCH] Rename Django's dev branch to main. (#445) * Rename Django's dev branch to main. More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: https://github.com/django/django/pull/14048 * Don't run tests against Django main on Python < 3.8. --- tox.ini | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index 9d38321..95ff67c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,10 @@ [tox] envlist = - py{36,37,38,39,py3}-django{22}-unittest - py{36,37,38,39,py3}-django{30,31,-master}-unittest - py{36,37,38,39,py3}-django{22,30,31,-master}-pytest + py{36,37,38,39,py3}-dj{22}-unittest + py{36,37,py3}-dj{30,31}-unittest + py{36,37,py3}-dj{22,30,31}-pytest + py{38,39}-dj{30,31,main}-unittest + py{38,39}-dj{22,30,31,main}-pytest [testenv] deps = @@ -10,16 +12,16 @@ deps = coverage mock django-picklefield - django-22: Django>=2.2,<3.0 - django-30: Django>=3.0,<3.1 - django-31: Django>=3.1,<3.2 - django-master: https://github.com/django/django/archive/master.tar.gz + dj22: Django>=2.2,<3.0 + dj30: Django>=3.0,<3.1 + dj31: Django>=3.1,<3.2 + djmain: https://github.com/django/django/archive/main.tar.gz pytest: pytest pytest: pytest-cov pytest: pytest-django usedevelop = True ignore_outcome = - django-master: True + djmain: True commands = unittest: coverage run {envbindir}/django-admin test -v2 unittest: coverage report