diff --git a/.travis.yml b/.travis.yml index 5945f3e..669ffbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - TOXENV=py27-1.7 - TOXENV=py27-1.8 - TOXENV=py27-1.9 - - TOXENV=py27-master + - TOXENV=py27-main - TOXENV=py32-1.7 - TOXENV=py32-1.8 - TOXENV=py33-1.7 @@ -16,7 +16,7 @@ env: - TOXENV=py34-1.7 - TOXENV=py34-1.8 - TOXENV=py34-1.9 - - TOXENV=py34-master + - TOXENV=py34-main matrix: include: @@ -25,11 +25,11 @@ matrix: - python: 3.5 env: TOXENV=py35-1.9 - python: 3.5 - env: TOXENV=py35-master + env: TOXENV=py35-main allow_failures: - - env: TOXENV=py27-master - - env: TOXENV=py34-master - - env: TOXENV=py35-master + - env: TOXENV=py27-main + - env: TOXENV=py34-main + - env: TOXENV=py35-main install: - pip install tox "virtualenv<14.0" diff --git a/tox.ini b/tox.ini index 14db46b..db9d815 100644 --- a/tox.ini +++ b/tox.ini @@ -3,11 +3,11 @@ args_are_paths = false envlist = flake8, isort, - py27-{1.7,1.8,1.9,master}, + py27-{1.7,1.8,1.9,main}, py32-{1.7,1.8}, py33-{1.7,1.8}, - py34-{1.7,1.8,1.9,master}, - py35-{1.8,1.9,master} + py34-{1.7,1.8,1.9,main}, + py35-{1.8,1.9,main} [testenv] basepython = @@ -33,7 +33,7 @@ deps = 1.7: Django>=1.7,<1.8 1.8: Django>=1.8,<1.9 1.9: Django>=1.9,<1.10 - master: https://github.com/django/django/archive/master.tar.gz + main: https://github.com/django/django/archive/main.tar.gz [testenv:flake8] basepython = python2.7