Permalink
Browse files

Merge branch 'tox2'

  • Loading branch information...
joshowen committed Nov 27, 2016
2 parents f235465 + dfe7dcd commit a309f5e4e65506703994d4d0fd6151fb28918d97
Showing with 11 additions and 23 deletions.
  1. +7 −15 .travis.yml
  2. +4 −8 tox.ini
View
@@ -1,26 +1,18 @@
language: python
python:
- "3.5"
- "3.4"
- "2.7"
sudo: false
env:
- TOX_ENV=py35-django19
- TOX_ENV=py34-django19
- TOX_ENV=py27-django19
- TOX_ENV=py35-django18
- TOX_ENV=py34-django18
- TOX_ENV=py27-django18
- TOX_ENV=py27-django110
- TOX_ENV=py35-django110
- TOX_ENV=py34-django110
- TOX_ENV=py27-djangomaster
- TOX_ENV=py34-djangomaster
- TOX_ENV=py35-djangomaster
- TOX_ENV=django19
- TOX_ENV=django18
- TOX_ENV=django110
- TOX_ENV=djangomaster
matrix:
fast_finish: true
allow_failures:
- env: TOX_ENV=py27-djangomaster
- env: TOX_ENV=py34-djangomaster
- env: TOX_ENV=py35-djangomaster
- env: TOX_ENV=djangomaster
install:
- pip install tox
script:
View
12 tox.ini
@@ -1,18 +1,14 @@
[tox]
envlist =
{py27,py34,py35}-django18,
{py27,py34,py35}-django19,
{py27,py34,py35}-django110,
{py27,py34,py35}-django{master}
django18,
django19,
django110,
django{master}
[testenv]
deps =
django18: Django==1.8.16
django19: Django==1.9.11
django110: Django==1.10.3
djangomaster: https://github.com/django/django/archive/master.tar.gz
basepython =
py35: python3.5
py34: python3.4
py27: python2.7
commands = python setup.py test

0 comments on commit a309f5e

Please sign in to comment.