Skip to content
This repository was archived by the owner on Mar 21, 2022. It is now read-only.

Commit 3ac74e7

Browse files
committed
Use tox to run tests.
1 parent ffbef69 commit 3ac74e7

File tree

5 files changed

+37
-44
lines changed

5 files changed

+37
-44
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ docs/_build/
77
*.egg-info/
88
.idea/
99

10-
sqlite.db
11-
settings.py
10+
.tox

.travis.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
language: python
1+
sudo: no
22

3-
python:
4-
- "2.7"
5-
- "3.3"
6-
- "3.4"
7-
- "pypy"
3+
language: python
84

95
env:
10-
- DJANGO_VERSION="1.4"
11-
- DJANGO_VERSION="1.5"
12-
- DJANGO_VERSION="1.6"
13-
- DJANGO_VERSION="1.7"
6+
- TOXENV=py27-1.4
7+
- TOXENV=py27-1.5
8+
- TOXENV=py27-1.6
9+
- TOXENV=py27-1.7
10+
- TOXENV=py33-1.5
11+
- TOXENV=py33-1.6
12+
- TOXENV=py33-1.7
13+
- TOXENV=py34-1.5
14+
- TOXENV=py34-1.6
15+
- TOXENV=py34-1.7
1416

1517
install:
16-
- pip install "Django>=${DJANGO_VERSION},<${DJANGO_VERSION}.99"
17-
- pip install -r requirements.txt
18-
19-
script: python manage.py test drip
18+
- pip install tox
2019

21-
matrix:
22-
exclude:
23-
- python: "3.3"
24-
env: DJANGO_VERSION="1.3"
25-
- python: "3.4"
26-
env: DJANGO_VERSION="1.3"
27-
- python: "3.3"
28-
env: DJANGO_VERSION="1.4"
29-
- python: "3.4"
30-
env: DJANGO_VERSION="1.4"
20+
script:
21+
- tox

manage.py

Lines changed: 0 additions & 11 deletions
This file was deleted.

requirements.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

tox.ini

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[tox]
2+
skipsdist = true
3+
args_are_paths = false
4+
envlist =
5+
py27-{1.4,1.5,1.6,1.7},
6+
py{33,34}-{1.5,1.6,1.7}
7+
8+
[testenv]
9+
basepython =
10+
py27: python2.7
11+
py33: python3.3
12+
py34: python3.4
13+
usedevelop = true
14+
commands =
15+
{envpython} -R -Wonce {envbindir}/django-admin.py test -v2 --settings=testsettings drip
16+
deps =
17+
django-timedeltafield==0.7.2
18+
1.4: Django>=1.4,<1.5
19+
1.5: Django>=1.5,<1.6
20+
1.6: Django>=1.6,<1.7
21+
1.7: Django>=1.7,<1.8

0 commit comments

Comments
 (0)