Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Additional tox environments which aren't run by default but are run o…

…n TravisCI.
  • Loading branch information...
commit 4372c0c4d77bf2bd6c91f060b27095698389775d 1 parent 94ce9fc
@mlavin mlavin authored
Showing with 36 additions and 7 deletions.
  1. +15 −6 .travis.yml
  2. +21 −1 tox.ini
View
21 .travis.yml
@@ -1,14 +1,23 @@
language: python
+
python:
- "2.6"
- - "2.7"
+
env:
- - DJANGO_VERSION=1.3.4
- - DJANGO_VERSION=1.4.2
+ - TOXENV=py26-1.4.X,py27-1.4.X
+ - TOXENV=py26-1.5.X,py27-1.5.X
+ - TOXENV=py26-trunk,py27-trunk
+
install:
- - pip install -q Django==$DJANGO_VERSION
- - pip install . --use-mirrors
-script: python setup.py test
+ - pip install tox --use-mirrors
+
+script:
+ - tox
+
branches:
only:
- master
+
+matrix:
+ allow_failures:
+ - env: TOXENV=py26-trunk,py27-trunk
View
22 tox.ini
@@ -1,15 +1,35 @@
[tox]
downloadcache = {toxworkdir}/_download/
-envlist = py26-1.5.X,py26-1.4.X,docs
+envlist = py26-trunk,py26-1.5.X,py26-1.4.X,docs
[testenv]
commands = {envpython} runtests.py
+[testenv:py27-trunk]
+basepython = python2.7
+deps = https://github.com/django/django/zipball/master
+ mock>=1.0.0
+
+[testenv:py26-trunk]
+basepython = python2.6
+deps = https://github.com/django/django/zipball/master
+ mock>=1.0.0
+
+[testenv:py27-1.5.X]
+basepython = python2.7
+deps = https://www.djangoproject.com/download/1.5c1/tarball/
+ mock>=1.0.0
+
[testenv:py26-1.5.X]
basepython = python2.6
deps = https://www.djangoproject.com/download/1.5c1/tarball/
mock>=1.0.0
+[testenv:py27-1.4.X]
+basepython = python2.7
+deps = django>=1.4,<1.5
+ mock>=1.0.0
+
[testenv:py26-1.4.X]
basepython = python2.6
deps = django>=1.4,<1.5
Please sign in to comment.
Something went wrong with that request. Please try again.