Skip to content

Commit

Permalink
Fix travis/tox
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Jan 14, 2020
1 parent 6575dec commit 404e449
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
21 changes: 15 additions & 6 deletions .travis.yml
Expand Up @@ -87,6 +87,9 @@ matrix:
- env: TOX_ENV=py37-django20
python: 3.7
dist: xenial
- env: TOX_ENV=py38-django20
python: 3.8
dist: xenial

- env: TOX_ENV=py35-django21
python: 3.5
Expand All @@ -97,6 +100,9 @@ matrix:
- env: TOX_ENV=py37-django21
python: 3.7
dist: xenial
- env: TOX_ENV=py38-django21
python: 3.8
dist: xenial

- env: TOX_ENV=py35-django22
python: 3.5
Expand All @@ -107,26 +113,29 @@ matrix:
- env: TOX_ENV=py37-django22
python: 3.7
dist: xenial

- env: TOX_ENV=py35-django30
python: 3.5
- env: TOX_ENV=py38-django22
python: 3.8
dist: xenial

- env: TOX_ENV=py36-django30
python: 3.6
dist: xenial
- env: TOX_ENV=py37-django30
python: 3.7
dist: xenial

- env: TOX_ENV=py35-djangomaster
python: 3.5
- env: TOX_ENV=py38-django30
python: 3.8
dist: xenial

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

# # django22 and django-master can only be installed into xenial images
# - python: 3.7
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Expand Up @@ -3,7 +3,8 @@ envlist =
py{27,34}-django{15,16}
py{27,34}-django{17}
py{27,34,35,36}-django{18,19,110,111}
py{35,36,37,38}-django{20,21,22,30,master}
py{35,36,37,38}-django{20,21,22}
py{36,37,38}-django{30,master}

;[travis]
;# Django <= 1.7 are excluded due to pytest versions.
Expand Down

0 comments on commit 404e449

Please sign in to comment.