Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added Django 1.5 to setup.py, tox and travis

  • Loading branch information...
commit eb59b6c5a72b6c52046b45cb0afca7f98b1cce10 1 parent 83382a2
Alejandro Varas alej0varas authored
Showing with 16 additions and 2 deletions.
  1. +2 −0  .travis.yml
  2. +1 −1  setup.py
  3. +13 −1 tox.ini
2  .travis.yml
View
@@ -6,6 +6,8 @@ python:
env:
- DJANGO=1.2.7
- DJANGO=1.3.1
+ - DJANGO=1.4.5
+ - DJANGO=1.5.1
install:
- sudo apt-get install libevent-dev
- sudo pip install Django==$DJANGO --use-mirrors
2  setup.py
View
@@ -19,7 +19,7 @@
url='http://github.com/dcramer/mock-django',
packages=find_packages(),
install_requires=[
- 'Django>=1.2,<1.5',
+ 'Django>=1.2',
'mock',
],
tests_require=[
14 tox.ini
View
@@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27-1.4,py26-1.4,py27-1.3,py26-1.3,py27-1.2,py26-1.2
+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
[testenv]
commands = {envpython} runtests.py
@@ -12,6 +12,18 @@ deps =
nose
unittest2
+[testenv:py27-1.5]
+basepython = python2.7
+deps =
+ -r{toxinidir}/tests/requirements.txt
+ django==1.5
+
+[testenv:py26-1.5]
+basepython = python2.6
+deps =
+ -r{toxinidir}/tests/requirements.txt
+ django==1.5
+
[testenv:py27-1.4]
basepython = python2.7
deps =
Please sign in to comment.
Something went wrong with that request. Please try again.