Skip to content

Commit eb59b6c

Browse files
committed
Added Django 1.5 to setup.py, tox and travis
1 parent 83382a2 commit eb59b6c

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ python:
66
env:
77
- DJANGO=1.2.7
88
- DJANGO=1.3.1
9+
- DJANGO=1.4.5
10+
- DJANGO=1.5.1
911
install:
1012
- sudo apt-get install libevent-dev
1113
- sudo pip install Django==$DJANGO --use-mirrors

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
url='http://github.com/dcramer/mock-django',
2020
packages=find_packages(),
2121
install_requires=[
22-
'Django>=1.2,<1.5',
22+
'Django>=1.2',
2323
'mock',
2424
],
2525
tests_require=[

tox.ini

+13-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,26 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py27-1.4,py26-1.4,py27-1.3,py26-1.3,py27-1.2,py26-1.2
7+
envlist = py27-1.5,py26-1.5,py27-1.4,py26-1.4,py27-1.3,py26-1.3,py27-1.2,py26-1.2
88

99
[testenv]
1010
commands = {envpython} runtests.py
1111
deps =
1212
nose
1313
unittest2
1414

15+
[testenv:py27-1.5]
16+
basepython = python2.7
17+
deps =
18+
-r{toxinidir}/tests/requirements.txt
19+
django==1.5
20+
21+
[testenv:py26-1.5]
22+
basepython = python2.6
23+
deps =
24+
-r{toxinidir}/tests/requirements.txt
25+
django==1.5
26+
1527
[testenv:py27-1.4]
1628
basepython = python2.7
1729
deps =

0 commit comments

Comments
 (0)