Skip to content

Commit f070619

Browse files
Updated tox/travis to point to Django main branch. (encode#7827)
1 parent 39a98c8 commit f070619

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ matrix:
2020
- { python: "3.8", env: DJANGO=3.0 }
2121
- { python: "3.8", env: DJANGO=3.1 }
2222
- { python: "3.8", env: DJANGO=3.2 }
23-
- { python: "3.8", env: DJANGO=master }
23+
- { python: "3.8", env: DJANGO=main }
2424

2525
- { python: "3.9", env: DJANGO=3.1 }
2626
- { python: "3.9", env: DJANGO=3.2 }
27-
- { python: "3.9", env: DJANGO=master }
27+
- { python: "3.9", env: DJANGO=main }
2828

2929
- { python: "3.8", env: TOXENV=base }
3030
- { python: "3.8", env: TOXENV=lint }
@@ -39,7 +39,7 @@ matrix:
3939
- tox # test sdist
4040

4141
allow_failures:
42-
- env: DJANGO=master
42+
- env: DJANGO=main
4343
- env: DJANGO=3.2
4444

4545
install:

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envlist =
44
{py36,py37,py38}-django30,
55
{py36,py37,py38,py39}-django31,
66
{py36,py37,py38,py39}-django32,
7-
{py38,py39}-djangomaster,
7+
{py38,py39}-djangomain,
88
base,dist,lint,docs,
99

1010
[travis:env]
@@ -13,7 +13,7 @@ DJANGO =
1313
3.0: django30
1414
3.1: django31
1515
3.2: django32
16-
master: djangomaster
16+
main: djangomain
1717

1818
[testenv]
1919
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs}
@@ -26,7 +26,7 @@ deps =
2626
django30: Django>=3.0,<3.1
2727
django31: Django>=3.1,<3.2
2828
django32: Django>=3.2a1,<4.0
29-
djangomaster: https://github.com/django/django/archive/master.tar.gz
29+
djangomain: https://github.com/django/django/archive/main.tar.gz
3030
-rrequirements/requirements-testing.txt
3131
-rrequirements/requirements-optionals.txt
3232

0 commit comments

Comments
 (0)