Merge pull request #183 from wojtek-fliposports/feature-django-and-python-upgrade
Feature django 1.11 and python 3.6 upgrade
This commit is contained in:
commit
2efd38cb64
2 changed files with 9 additions and 3 deletions
|
@ -3,15 +3,19 @@ python:
|
||||||
- "2.7"
|
- "2.7"
|
||||||
- "3.4"
|
- "3.4"
|
||||||
- "3.5"
|
- "3.5"
|
||||||
|
- "3.6"
|
||||||
env:
|
env:
|
||||||
- DJANGO=1.7
|
- DJANGO=1.7
|
||||||
- DJANGO=1.8
|
- DJANGO=1.8
|
||||||
- DJANGO=1.9
|
- DJANGO=1.9
|
||||||
- DJANGO=1.10
|
- DJANGO=1.10
|
||||||
|
- DJANGO=1.11
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
exclude:
|
||||||
- python: "3.5"
|
- python: "3.5"
|
||||||
env: DJANGO=1.7
|
env: DJANGO=1.7
|
||||||
|
- python: "3.6"
|
||||||
|
env: DJANGO=1.7
|
||||||
install:
|
install:
|
||||||
- pip install tox coveralls
|
- pip install tox coveralls
|
||||||
script:
|
script:
|
||||||
|
|
8
tox.ini
8
tox.ini
|
@ -2,9 +2,10 @@
|
||||||
|
|
||||||
envlist=
|
envlist=
|
||||||
clean,
|
clean,
|
||||||
py27-django{17,18,19,110},
|
py27-django{17,18,19,110,111},
|
||||||
py34-django{17,18,19,110},
|
py34-django{17,18,19,110,111},
|
||||||
py35-django{18,19,110},
|
py35-django{18,19,110,111},
|
||||||
|
py36-django{18,19,110,111},
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
|
||||||
|
@ -13,6 +14,7 @@ deps =
|
||||||
django18: django>=1.8,<1.9
|
django18: django>=1.8,<1.9
|
||||||
django19: django>=1.9,<1.10
|
django19: django>=1.9,<1.10
|
||||||
django110: django>=1.10,<1.11
|
django110: django>=1.10,<1.11
|
||||||
|
django111: django>=1.11,<1.12
|
||||||
coverage
|
coverage
|
||||||
mock
|
mock
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue