Commit fc250bf7 by José Padilla

Test with released Django 1.7

parent f08afe16
...@@ -8,7 +8,7 @@ python: ...@@ -8,7 +8,7 @@ python:
- "3.4" - "3.4"
env: env:
- DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - DJANGO="django==1.7"
- DJANGO="django==1.6.5" - DJANGO="django==1.6.5"
- DJANGO="django==1.5.8" - DJANGO="django==1.5.8"
- DJANGO="django==1.4.13" - DJANGO="django==1.4.13"
...@@ -25,7 +25,7 @@ install: ...@@ -25,7 +25,7 @@ install:
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
- "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi"
- "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi"
- "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7c2/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - "if [[ ${DJANGO} == 'django==1.7' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
- export PYTHONPATH=. - export PYTHONPATH=.
script: script:
...@@ -34,7 +34,7 @@ script: ...@@ -34,7 +34,7 @@ script:
matrix: matrix:
exclude: exclude:
- python: "2.6" - python: "2.6"
env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" env: DJANGO="django==1.7"
- python: "3.2" - python: "3.2"
env: DJANGO="django==1.4.13" env: DJANGO="django==1.4.13"
- python: "3.3" - python: "3.3"
......
...@@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly ...@@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly
[testenv:py3.4-django1.7] [testenv:py3.4-django1.7]
basepython = python3.4 basepython = python3.4
deps = https://www.djangoproject.com/download/1.7c2/tarball/ deps = Django==1.7
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
...@@ -26,7 +26,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ ...@@ -26,7 +26,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/
[testenv:py3.3-django1.7] [testenv:py3.3-django1.7]
basepython = python3.3 basepython = python3.3
deps = https://www.djangoproject.com/download/1.7c2/tarball/ deps = Django==1.7
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
...@@ -34,7 +34,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ ...@@ -34,7 +34,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/
[testenv:py3.2-django1.7] [testenv:py3.2-django1.7]
basepython = python3.2 basepython = python3.2
deps = https://www.djangoproject.com/download/1.7c2/tarball/ deps = Django==1.7
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
...@@ -42,7 +42,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ ...@@ -42,7 +42,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/
[testenv:py2.7-django1.7] [testenv:py2.7-django1.7]
basepython = python2.7 basepython = python2.7
deps = https://www.djangoproject.com/download/1.7c2/tarball/ deps = Django==1.7
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
# django-oauth-plus==2.2.1 # django-oauth-plus==2.2.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment