kumi/django-oidc-provider
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #182 from juanifioren/revert-180-feature-django-and-python-upgrade

Browse source 
reverted wrong commit
This commit is contained in:
Wojciech Bartosiak 2017-05-08 18:18:43 +02:00 committed by GitHub
parent 2bb4229cfe 8c55cf0cb6
commit 3cc211a2c9
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -3,19 +3,15 @@ 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
View file

@ -2,10 +2,9 @@
envlist= envlist=
clean, clean,
py27-django{17,18,19,110,111}, py27-django{17,18,19,110},
py34-django{17,18,19,110,111}, py34-django{17,18,19,110},
py35-django{18,19,110,111}, py35-django{18,19,110},
py36-django{18,19,110,111},
[testenv] [testenv]
@ -14,7 +13,6 @@ 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