Skip to content

Commit 75e7ee1

Browse files
authored
Merge pull request #131 from jazzband/master-to-main
Rename Django's dev branch to main.
2 parents 594688d + dfab498 commit 75e7ee1

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
max-parallel: 5
1212
matrix:
1313
python-version: ['3.6', '3.7', '3.8', '3.9']
14-
django-version: ['2.2', '3.0', '3.1', 'master']
14+
django-version: ['2.2', '3.0', '3.1', 'main']
1515

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

tox.ini

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
; Minimum version of Tox
33
minversion = 1.8
44
envlist =
5-
py{36,37,38,39}-dj{22,30,31,master}
5+
py{36,37,38,39}-dj{22,30,31}
6+
py{38,39}-djmain
67
flake8
78

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

2223
[testenv]
2324
commands =
@@ -29,9 +30,9 @@ deps =
2930
dj22: Django<2.3
3031
dj30: Django<3.1
3132
dj31: Django<3.2
32-
djmaster: https://github.com/django/django/archive/master.tar.gz
33+
djmain: https://github.com/django/django/archive/main.tar.gz
3334
ignore_outcome =
34-
djmaster: True
35+
djmain: True
3536
whitelist_externals = make
3637

3738
[testenv:flake8]

0 commit comments

Comments
 (0)