aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2015-02-26 13:23:05 +0000
committerTom Christie2015-02-26 13:23:05 +0000
commitb3956bc591e7bd2c0d1460cdbc2731a372df25a5 (patch)
treed6dae835f5a207d2aa3f27babfb0aeabd6ba7f71
parente72428214c33b889f61ac83c7f39030b4c66317d (diff)
downloaddjango-rest-framework-b3956bc591e7bd2c0d1460cdbc2731a372df25a5.tar.bz2
Upgrade testing env name to django18beta
-rw-r--r--.travis.yml8
-rw-r--r--tox.ini4
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 4f929785..3eb89dc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,10 @@ env:
- TOX_ENV=py26-django15
- TOX_ENV=py27-django14
- TOX_ENV=py26-django14
- - TOX_ENV=py34-django18alpha
- - TOX_ENV=py33-django18alpha
- - TOX_ENV=py32-django18alpha
- - TOX_ENV=py27-django18alpha
+ - TOX_ENV=py34-django18beta
+ - TOX_ENV=py33-django18beta
+ - TOX_ENV=py32-django18beta
+ - TOX_ENV=py27-django18beta
install:
- pip install tox
diff --git a/tox.ini b/tox.ini
index f626268c..c986250c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
- {py27,py32,py33,py34}-django{17,18alpha}
+ {py27,py32,py33,py34}-django{17,18beta}
[testenv]
commands = ./runtests.py --fast
@@ -14,7 +14,7 @@ deps =
django15: Django==1.5.6 # Should track minimum supported
django16: Django==1.6.3 # Should track minimum supported
django17: Django==1.7.2 # Should track maximum supported
- django18alpha: https://www.djangoproject.com/download/1.8b1/tarball/
+ django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt