Skip to content

Commit cd9adae

Browse files
authored
Rename Django's dev branch to main. (#746)
More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: django/django#14048
1 parent e7acf03 commit cd9adae

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
13-
django-version: ['2.2', '3.0', '3.1', 'dev']
13+
django-version: ['2.2', '3.0', '3.1', 'main']
1414

1515
steps:
1616
- uses: actions/checkout@v2

tox.ini

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[tox]
22
envlist =
33
pypy3-dj{22,30,31}
4-
py{36,37,38,39}-dj{22,30,31,dev}
4+
py{36,37,38,39}-dj{22,30,31}
5+
py{38,39}-djmain
56
docs
67

78
[gh-actions]
@@ -17,7 +18,7 @@ DJANGO =
1718
2.2: dj22
1819
3.0: dj30
1920
3.1: dj31
20-
dev: djdev
21+
main: djmain
2122

2223
[testenv]
2324
basepython =
@@ -31,7 +32,7 @@ deps =
3132
dj22: Django>=2.2.1,<2.3
3233
dj30: Django>=3.0,<3.1
3334
dj31: Django>=3.1,<3.2
34-
djdev: https://github.com/django/django/archive/master.tar.gz
35+
djmain: https://github.com/django/django/archive/main.tar.gz
3536
jinja2
3637
coverage
3738
jsmin==2.2.0
@@ -48,9 +49,9 @@ commands =
4849
{envbindir}/coverage xml
4950
whitelist_externals = npm
5051
ignore_outcome =
51-
djdev: True
52+
djmain: True
5253
ignore_errors =
53-
djdev: True
54+
djmain: True
5455

5556
[testenv:docs]
5657
basepython = python3.8

0 commit comments

Comments
 (0)