encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 19:39:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2126 from NextHub/master

Browse Source 
Removed dots in Django versions in tox. Refs #2124.
This commit is contained in:
Tom Christie 2014-11-25 11:11:17 +00:00
commit 17c7431a6d
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.travis.yml
View File

@ -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

24
tox.ini
View File

@ -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