diff options
| author | José Padilla | 2014-09-03 09:58:21 -0700 |
|---|---|---|
| committer | José Padilla | 2014-09-03 09:58:21 -0700 |
| commit | fc250bf74bf3d88376bd1d41eab7c1ff6f4f8e5e (patch) | |
| tree | 00317b6f615a444b985fe7eefda5a86cb2920e8f | |
| parent | f08afe162cb1d0a589674ca26dc6184c7b3d185c (diff) | |
| download | django-rest-framework-fc250bf74bf3d88376bd1d41eab7c1ff6f4f8e5e.tar.bz2 | |
Test with released Django 1.7
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | tox.ini | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index ececf3e9..e768e146 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.4" env: - - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + - DJANGO="django==1.7" - DJANGO="django==1.6.5" - DJANGO="django==1.5.8" - DJANGO="django==1.4.13" @@ -25,7 +25,7 @@ install: - "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.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=. script: @@ -34,7 +34,7 @@ script: matrix: exclude: - python: "2.6" - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + env: DJANGO="django==1.7" - python: "3.2" env: DJANGO="django==1.4.13" - python: "3.3" @@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] basepython = python3.4 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -26,7 +26,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.3-django1.7] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -34,7 +34,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.2-django1.7] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -42,7 +42,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py2.7-django1.7] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 # django-oauth-plus==2.2.1 |