diff options
| author | Tom Christie | 2014-11-25 11:11:17 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-25 11:11:17 +0000 |
| commit | 17c7431a6d629cc284b1417c60811cbdf154ce62 (patch) | |
| tree | 6a244a8dd1f1bd55f10ee0d986b98ae9dacd28e1 | |
| parent | 85f5e79cf36cc856ce23c060461472ed92dda999 (diff) | |
| parent | c559ec6da8f983e34ca9a4183e5f632124d77cbc (diff) | |
| download | django-rest-framework-17c7431a6d629cc284b1417c60811cbdf154ce62.tar.bz2 | |
Merge pull request #2126 from NextHub/master
Removed dots in Django versions in tox. Refs #2124.
| -rw-r--r-- | .travis.yml | 32 | ||||
| -rw-r--r-- | tox.ini | 24 |
2 files changed, 28 insertions, 28 deletions
diff --git a/.travis.yml b/.travis.yml index 2791df6e..9dd587be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,22 +4,22 @@ sudo: false env: - TOX_ENV=py27-flake8 - - TOX_ENV=py34-django1.7 - - TOX_ENV=py33-django1.7 - - TOX_ENV=py32-django1.7 - - TOX_ENV=py27-django1.7 - - TOX_ENV=py34-django1.6 - - TOX_ENV=py33-django1.6 - - TOX_ENV=py32-django1.6 - - TOX_ENV=py27-django1.6 - - TOX_ENV=py26-django1.6 - - TOX_ENV=py34-django1.5 - - TOX_ENV=py33-django1.5 - - TOX_ENV=py32-django1.5 - - TOX_ENV=py27-django1.5 - - TOX_ENV=py26-django1.5 - - TOX_ENV=py27-django1.4 - - TOX_ENV=py26-django1.4 + - TOX_ENV=py34-django17 + - TOX_ENV=py33-django17 + - TOX_ENV=py32-django17 + - TOX_ENV=py27-django17 + - TOX_ENV=py34-django16 + - TOX_ENV=py33-django16 + - TOX_ENV=py32-django16 + - TOX_ENV=py27-django16 + - TOX_ENV=py26-django16 + - TOX_ENV=py34-django15 + - TOX_ENV=py33-django15 + - TOX_ENV=py32-django15 + - TOX_ENV=py27-django15 + - TOX_ENV=py26-django15 + - TOX_ENV=py27-django14 + - TOX_ENV=py26-django14 - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster - TOX_ENV=py32-djangomaster @@ -1,25 +1,25 @@ [tox] envlist = py27-flake8, - {py26,py27}-django1.4, - {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django{1.7,master} + {py26,py27}-django14, + {py26,py27,py32,py33,py34}-django{15,16}, + {py27,py32,py33,py34}-django{17,master} [testenv] commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django1.4: django==1.4.11 - django1.5: django==1.5.6 - django1.6: Django==1.6.3 - django1.7: Django==1.7 + django14: django==1.4.11 + django15: django==1.5.6 + django16: Django==1.6.3 + django17: Django==1.7 djangomaster: https://github.com/django/django/zipball/master - {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3 - {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211 - {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1 - {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3 - {py26,py27}-django1.6: django-oauth2-provider==0.2.4 + {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 + {py26,py27}-django{14,15,16}: oauth2==1.5.211 + {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 + {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 + {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 |