Skip to content

Commit 9852eea

Browse files
authored
Rename Django's dev branch to main. (#807)
* Rename Django's dev branch to main. More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: django/django#14048 * Downgrade to 18.04 to work-around the issue with mysql/mariadb.
1 parent 0a550c7 commit 9852eea

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ on: [push, pull_request]
55
jobs:
66
build:
77
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-18.04
99

1010
strategy:
1111
fail-fast: false
1212
matrix:
1313
python-version: ['3.6', '3.7', '3.8', '3.9']
14-
django-version: ['2.2', '3.0', '3.1', 'dev']
14+
django-version: ['2.2', '3.0', '3.1', 'main']
1515

1616
exclude:
1717
- python-version: '3.6'
18-
django-version: 'dev'
18+
django-version: 'main'
1919
- python-version: '3.7'
20-
django-version: 'dev'
20+
django-version: 'main'
2121

2222
services:
2323

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
py{36,37,38,39}-dj{22,30,31}-{sqlite3,postgres,mysql,mariadb},
4-
py{38,39}-dj{dev}-{sqlite3,postgres,mysql,mariadb},
4+
py{38,39}-djmain-{sqlite3,postgres,mysql,mariadb},
55
docs,
66
lint
77

@@ -17,7 +17,7 @@ DJANGO =
1717
2.2: dj22
1818
3.0: dj30
1919
3.1: dj31
20-
dev: djdev
20+
main: djmain
2121

2222
[flake8]
2323
ignore = N802,F401,W503
@@ -31,7 +31,7 @@ deps =
3131
dj22: Django>=2.2,<2.3
3232
dj30: Django>=3.0,<3.1
3333
dj31: Django>=3.1,<3.2
34-
djdev: https://github.com/django/django/tarball/master
34+
djmain: https://github.com/django/django/tarball/main
3535
postgres: -rrequirements/postgres.txt
3636
mysql: -rrequirements/mysql.txt
3737
mariadb: -rrequirements/mysql.txt

0 commit comments

Comments
 (0)