Briq
/
django-admin-interface
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed django 2.2 from tox and travis.

pull/57/head
Fabio Caccamo 2019-02-06 17:00:45 +01:00
parent 8bffc8f82a
commit a48d2175ba
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@ -35,8 +35,6 @@ env:
- TOX_ENV=py35-dj20-postgres - TOX_ENV=py35-dj20-postgres
- TOX_ENV=py35-dj21-sqlite - TOX_ENV=py35-dj21-sqlite
- TOX_ENV=py35-dj21-postgres - TOX_ENV=py35-dj21-postgres
- TOX_ENV=py35-dj22-sqlite
- TOX_ENV=py35-dj22-postgres
matrix: matrix:
include: include:
- python: "3.6" - python: "3.6"
@ -51,10 +49,6 @@ matrix:
env: env:
- TOX_ENV=py36-dj21-sqlite - TOX_ENV=py36-dj21-sqlite
- TOX_ENV=py36-dj21-postgres - TOX_ENV=py36-dj21-postgres
- python: "3.6"
env:
- TOX_ENV=py36-dj22-sqlite
- TOX_ENV=py36-dj22-postgres
- python: "3.6" - python: "3.6"
env: env:
- TOX_ENV=py36-djmaster-sqlite - TOX_ENV=py36-djmaster-sqlite
@ -73,13 +67,6 @@ matrix:
dist: xenial dist: xenial
language: python language: python
sudo: required sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-dj22-sqlite
- TOX_ENV=py37-dj22-postgres
dist: xenial
language: python
sudo: required
- python: "3.7" - python: "3.7"
env: env:
- TOX_ENV=py37-djmaster-sqlite - TOX_ENV=py37-djmaster-sqlite

7
tox.ini
View File

@ -2,9 +2,9 @@
envlist = envlist =
py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres}, py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres}, py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres},
py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres}, py35-{dj18,dj19,dj110,dj111,dj20,dj21}-{sqlite,postgres},
py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,djmaster}-{sqlite,postgres}, py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster}-{sqlite,postgres},
py37-{dj20,dj21,dj22,djmaster}-{sqlite,postgres}, py37-{dj20,dj21,djmaster}-{sqlite,postgres},
[testenv] [testenv]
passenv = CI TRAVIS TRAVIS_* passenv = CI TRAVIS TRAVIS_*
deps = deps =
@ -15,7 +15,6 @@ deps =
dj111: Django >= 1.11, < 1.12 dj111: Django >= 1.11, < 1.12
dj20: Django >= 2.0, < 2.1 dj20: Django >= 2.0, < 2.1
dj21: Django >= 2.1, < 2.2 dj21: Django >= 2.1, < 2.2
dj22: Django >= 2.2, < 2.3
djmaster: https://github.com/django/django/archive/master.tar.gz djmaster: https://github.com/django/django/archive/master.tar.gz
# mysql: mysqlclient # mysql: mysqlclient
postgres: psycopg2-binary postgres: psycopg2-binary