Skip to content

Commit

Permalink
Rename Django's dev branch to main.
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez authored and aleksihakli committed Mar 11, 2021
1 parent eff4926 commit 2ece702
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 5
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
django-version: ['2.2', '3.0', '3.1', 'dev']
django-version: ['2.2', '3.0', '3.1', 'main']

steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tox]
envlist =
py{36,37,38}-dj{22,30,31,dev}
py{36,37,38,39}-dj{22,30,31}
py{38,39}-djmain
qa

[gh-actions]
Expand All @@ -15,18 +16,18 @@ DJANGO =
2.2: dj22
3.0: dj30
3.1: dj31
dev: djdev
main: djmain

[testenv]
deps =
coverage
dj22: django>=2.2,<2.3
dj30: django>=3.0,<3.1
dj31: django>=3.1,<3.2
djdev: https://github.com/django/django/archive/master.tar.gz
djmain: https://github.com/django/django/archive/main.tar.gz
usedevelop = True
ignore_outcome =
djdev: True
djmain: True
commands =
{envbindir}/coverage run {envbindir}/django-admin test -v2 --settings=tests.settings
{envbindir}/coverage report -m
Expand Down

0 comments on commit 2ece702

Please sign in to comment.