Skip to content

Commit c559ec6

Browse files
committed
Removed dots in Django versions in tox. Refs #2124.
1 parent 85f5e79 commit c559ec6

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

.travis.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ sudo: false
44

55
env:
66
- TOX_ENV=py27-flake8
7-
- TOX_ENV=py34-django1.7
8-
- TOX_ENV=py33-django1.7
9-
- TOX_ENV=py32-django1.7
10-
- TOX_ENV=py27-django1.7
11-
- TOX_ENV=py34-django1.6
12-
- TOX_ENV=py33-django1.6
13-
- TOX_ENV=py32-django1.6
14-
- TOX_ENV=py27-django1.6
15-
- TOX_ENV=py26-django1.6
16-
- TOX_ENV=py34-django1.5
17-
- TOX_ENV=py33-django1.5
18-
- TOX_ENV=py32-django1.5
19-
- TOX_ENV=py27-django1.5
20-
- TOX_ENV=py26-django1.5
21-
- TOX_ENV=py27-django1.4
22-
- TOX_ENV=py26-django1.4
7+
- TOX_ENV=py34-django17
8+
- TOX_ENV=py33-django17
9+
- TOX_ENV=py32-django17
10+
- TOX_ENV=py27-django17
11+
- TOX_ENV=py34-django16
12+
- TOX_ENV=py33-django16
13+
- TOX_ENV=py32-django16
14+
- TOX_ENV=py27-django16
15+
- TOX_ENV=py26-django16
16+
- TOX_ENV=py34-django15
17+
- TOX_ENV=py33-django15
18+
- TOX_ENV=py32-django15
19+
- TOX_ENV=py27-django15
20+
- TOX_ENV=py26-django15
21+
- TOX_ENV=py27-django14
22+
- TOX_ENV=py26-django14
2323
- TOX_ENV=py34-djangomaster
2424
- TOX_ENV=py33-djangomaster
2525
- TOX_ENV=py32-djangomaster

tox.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[tox]
22
envlist =
33
py27-flake8,
4-
{py26,py27}-django1.4,
5-
{py26,py27,py32,py33,py34}-django{1.5,1.6},
6-
{py27,py32,py33,py34}-django{1.7,master}
4+
{py26,py27}-django14,
5+
{py26,py27,py32,py33,py34}-django{15,16},
6+
{py27,py32,py33,py34}-django{17,master}
77

88
[testenv]
99
commands = ./runtests.py --fast
1010
setenv =
1111
PYTHONDONTWRITEBYTECODE=1
1212
deps =
13-
django1.4: django==1.4.11
14-
django1.5: django==1.5.6
15-
django1.6: Django==1.6.3
16-
django1.7: Django==1.7
13+
django14: django==1.4.11
14+
django15: django==1.5.6
15+
django16: Django==1.6.3
16+
django17: Django==1.7
1717
djangomaster: https://github.com/django/django/zipball/master
18-
{py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3
19-
{py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211
20-
{py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1
21-
{py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3
22-
{py26,py27}-django1.6: django-oauth2-provider==0.2.4
18+
{py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
19+
{py26,py27}-django{14,15,16}: oauth2==1.5.211
20+
{py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1
21+
{py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
22+
{py26,py27}-django16: django-oauth2-provider==0.2.4
2323
pytest-django==2.6.1
2424
django-filter==0.7
2525
defusedxml==0.3

0 commit comments

Comments
 (0)