Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit 474445d

Browse files
jpadillajpadilla
committed
Update tox and Travis CI setup
1 parent 50d8369 commit 474445d

File tree

3 files changed

+45
-165
lines changed

3 files changed

+45
-165
lines changed

‎.travis.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ language: python
22

33
sudo: false
44

5-
python:
6-
- "2.6"
7-
- "2.7"
8-
- "3.2"
9-
- "3.3"
10-
- "3.4"
11-
125
env:
13-
- DJANGO="django==1.7"
14-
- DJANGO="django==1.6.5"
15-
- DJANGO="django==1.5.8"
16-
- DJANGO="django==1.4.13"
6+
- TOX_ENV=py27-flake8
7+
- TOX_ENV=py27-django1.6-drf2.4.3
8+
- TOX_ENV=py27-django1.6-drf2.4.4
9+
- TOX_ENV=py27-django1.6-drf3.0
10+
- TOX_ENV=py27-django1.7-drf2.4.3
11+
- TOX_ENV=py27-django1.7-drf2.4.4
12+
- TOX_ENV=py27-django1.7-drf3.0
13+
- TOX_ENV=py32-django1.6-drf2.4.3
14+
- TOX_ENV=py32-django1.6-drf2.4.4
15+
- TOX_ENV=py32-django1.6-drf3.0
16+
- TOX_ENV=py32-django1.7-drf2.4.3
17+
- TOX_ENV=py32-django1.7-drf2.4.4
18+
- TOX_ENV=py32-django1.7-drf3.0
19+
- TOX_ENV=py33-django1.6-drf2.4.3
20+
- TOX_ENV=py33-django1.6-drf2.4.4
21+
- TOX_ENV=py33-django1.6-drf3.0
22+
- TOX_ENV=py33-django1.7-drf2.4.3
23+
- TOX_ENV=py33-django1.7-drf2.4.4
24+
- TOX_ENV=py33-django1.7-drf3.0
25+
- TOX_ENV=py34-django1.6-drf2.4.3
26+
- TOX_ENV=py34-django1.6-drf2.4.4
27+
- TOX_ENV=py34-django1.6-drf3.0
28+
- TOX_ENV=py34-django1.7-drf2.4.3
29+
- TOX_ENV=py34-django1.7-drf2.4.4
30+
- TOX_ENV=py34-django1.7-drf3.0
31+
32+
matrix:
33+
fast_finish: true
1734

1835
install:
19-
- pip install $DJANGO
20-
- pip install pytest-django==2.6.1
21-
- pip install flake8==2.2.2
22-
- pip install djangorestframework>=2.3.11
23-
- pip install PyJWT>=0.1.8
24-
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
25-
- export PYTHONPATH=.
36+
- pip install tox
2637

2738
script:
28-
- ./runtests.py
29-
30-
matrix:
31-
exclude:
32-
- python: "2.6"
33-
env: DJANGO="django==1.7"
34-
- python: "3.2"
35-
env: DJANGO="django==1.4.13"
36-
- python: "3.3"
37-
env: DJANGO="django==1.4.13"
38-
- python: "3.4"
39-
env: DJANGO="django==1.4.13"
39+
- tox -e $TOX_ENV

‎requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Django>=1.3
2-
djangorestframework>=2.3.11
31
PyJWT>=0.3.0,<0.4

‎tox.ini

Lines changed: 15 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,22 @@
11
[tox]
2-
downloadcache = {toxworkdir}/cache/
32
envlist =
4-
py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
5-
py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
6-
py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
7-
py2.7-django1.4,py2.6-django1.4
3+
py27-flake8,
4+
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0}
85

96
[testenv]
107
commands = ./runtests.py --fast
11-
12-
[testenv:flake8]
13-
basepython = python2.7
14-
deps = pytest==2.5.2
15-
flake8==2.2.2
16-
commands = ./runtests.py --lintonly
17-
18-
[testenv:py3.4-django1.7]
19-
basepython = python3.4
20-
deps = Django==1.7
21-
djangorestframework>=2.3.11
22-
PyJWT>=0.1.8
23-
pytest-django==2.6.1
24-
25-
[testenv:py3.3-django1.7]
26-
basepython = python3.3
27-
deps = Django==1.7
28-
djangorestframework>=2.3.11
29-
PyJWT>=0.1.8
30-
pytest-django==2.6.1
31-
32-
[testenv:py3.2-django1.7]
33-
basepython = python3.2
34-
deps = Django==1.7
35-
djangorestframework>=2.3.11
36-
PyJWT>=0.1.8
37-
pytest-django==2.6.1
38-
39-
[testenv:py2.7-django1.7]
40-
basepython = python2.7
41-
deps = Django==1.7
42-
djangorestframework>=2.3.11
43-
PyJWT>=0.1.8
44-
pytest-django==2.6.1
45-
46-
[testenv:py3.4-django1.6]
47-
basepython = python3.4
48-
deps = Django==1.6.3
49-
djangorestframework>=2.3.11
50-
PyJWT>=0.1.8
51-
pytest-django==2.6.1
52-
53-
[testenv:py3.3-django1.6]
54-
basepython = python3.3
55-
deps = Django==1.6.3
56-
djangorestframework>=2.3.11
57-
PyJWT>=0.1.8
58-
pytest-django==2.6.1
59-
60-
[testenv:py3.2-django1.6]
61-
basepython = python3.2
62-
deps = Django==1.6.3
63-
djangorestframework>=2.3.11
64-
PyJWT>=0.1.8
65-
pytest-django==2.6.1
66-
67-
[testenv:py2.7-django1.6]
68-
basepython = python2.7
69-
deps = Django==1.6.3
70-
oauth2==1.5.211
71-
django-oauth2-provider==0.2.4
72-
djangorestframework>=2.3.11
73-
PyJWT>=0.1.8
8+
setenv =
9+
PYTHONDONTWRITEBYTECODE=1
10+
deps =
11+
django1.6: Django==1.6.8
12+
django1.7: Django==1.7.1
13+
drf2.4.3: djangorestframework==2.4.3
14+
drf2.4.4: djangorestframework==2.4.4
15+
drf3.0: https://github.com/tomchristie/django-rest-framework/archive/3.0-beta.zip
7416
pytest-django==2.6.1
7517

76-
[testenv:py2.6-django1.6]
77-
basepython = python2.6
78-
deps = Django==1.6.3
79-
oauth2==1.5.211
80-
django-oauth2-provider==0.2.4
81-
djangorestframework>=2.3.11
82-
PyJWT>=0.1.8
83-
pytest-django==2.6.1
84-
85-
[testenv:py3.4-django1.5]
86-
basepython = python3.4
87-
deps = Django==1.5.6
88-
djangorestframework>=2.3.11
89-
PyJWT>=0.1.8
90-
pytest-django==2.6.1
91-
92-
[testenv:py3.3-django1.5]
93-
basepython = python3.3
94-
deps = Django==1.5.6
95-
djangorestframework>=2.3.11
96-
PyJWT>=0.1.8
97-
pytest-django==2.6.1
98-
99-
[testenv:py3.2-django1.5]
100-
basepython = python3.2
101-
deps = Django==1.5.6
102-
djangorestframework>=2.3.11
103-
PyJWT>=0.1.8
104-
pytest-django==2.6.1
105-
106-
[testenv:py2.7-django1.5]
107-
basepython = python2.7
108-
deps = Django==1.5.6
109-
oauth2==1.5.211
110-
django-oauth2-provider==0.2.3
111-
djangorestframework>=2.3.11
112-
PyJWT>=0.1.8
113-
pytest-django==2.6.1
114-
115-
[testenv:py2.6-django1.5]
116-
basepython = python2.6
117-
deps = Django==1.5.6
118-
oauth2==1.5.211
119-
django-oauth2-provider==0.2.3
120-
djangorestframework>=2.3.11
121-
PyJWT>=0.1.8
122-
pytest-django==2.6.1
123-
124-
[testenv:py2.7-django1.4]
125-
basepython = python2.7
126-
deps = Django==1.4.11
127-
oauth2==1.5.211
128-
django-oauth2-provider==0.2.3
129-
djangorestframework>=2.3.11
130-
PyJWT>=0.1.8
131-
pytest-django==2.6.1
132-
133-
[testenv:py2.6-django1.4]
134-
basepython = python2.6
135-
deps = Django==1.4.11
136-
oauth2==1.5.211
137-
django-oauth2-provider==0.2.3
138-
djangorestframework>=2.3.11
139-
PyJWT>=0.1.8
140-
pytest-django==2.6.1
18+
[testenv:py27-flake8]
19+
commands = ./runtests.py --lintonly
20+
deps =
21+
pytest==2.5.2
22+
flake8==2.2.2

0 commit comments

Comments
 (0)