Merge branch 'v0.3.x' of https://github.com/juanifioren/django-oidc-provider into feature-prompt

This commit is contained in:
Ignacio Fiorentino 2016-04-13 18:40:04 -03:00
commit 49f011b52b
2 changed files with 6 additions and 1 deletions

View file

@ -2,10 +2,15 @@ language: python
python: python:
- "2.7" - "2.7"
- "3.4" - "3.4"
- "3.5"
env: env:
- DJANGO=1.7 - DJANGO=1.7
- DJANGO=1.8 - DJANGO=1.8
- DJANGO=1.9 - DJANGO=1.9
matrix:
exclude:
- python: "3.5"
env: DJANGO=1.7
install: install:
- pip install -q django==$DJANGO - pip install -q django==$DJANGO
- pip install -e . - pip install -e .

View file

@ -1,7 +1,7 @@
[tox] [tox]
envlist= envlist=
clean,py{27,34}-django{17,18,19},stats clean,py{27,34}-django{17,18,19},py35-django{18,19},stats
[testenv] [testenv]