Skip to content

Commit

Permalink
Merge pull request #5 from jramnai/django-upgrade
Browse files Browse the repository at this point in the history
feat: added django 3.1 support
  • Loading branch information
barseghyanartur committed Aug 24, 2021
2 parents ea86070 + a0489a0 commit f007d5a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@ matrix:
python: 3.8
dist: xenial

- env: TOX_ENV=py36-django31
python: 3.6
dist: xenial
- env: TOX_ENV=py37-django31
python: 3.7
dist: xenial
- env: TOX_ENV=py38-django31
python: 3.8
dist: xenial

- env: TOX_ENV=py36-djangomaster
python: 3.6
dist: xenial
Expand Down
7 changes: 7 additions & 0 deletions examples/requirements/django_3_1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pytest==6.2.4
pytest-django==4.4.0
pytest-cov==2.6.1

-r base.txt

Django>=3.1,<3.2
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ envlist =
py{27,34}-django{17}
py{27,34,35,36}-django{18,19,110,111}
py{35,36,37,38}-django{20,21,22}
py{36,37,38}-django{30,master}
py{36,37,38}-django{30,31,master}

;[travis]
;# Django <= 1.7 are excluded due to pytest versions.
Expand Down Expand Up @@ -33,6 +33,7 @@ deps =
django21: -r{toxinidir}/examples/requirements/django_2_1.txt
django22: -r{toxinidir}/examples/requirements/django_2_2.txt
django30: -r{toxinidir}/examples/requirements/django_3_0.txt
django31: -r{toxinidir}/examples/requirements/django_3_1.txt
djangomaster: -r{toxinidir}/examples/requirements/django_master.txt

commands =
Expand Down

0 comments on commit f007d5a

Please sign in to comment.