From dfe7dcd05d0df27d8be502d750501857a055d654 Mon Sep 17 00:00:00 2001 From: Josh Owen Date: Sun, 27 Nov 2016 10:51:52 -0500 Subject: [PATCH] another try --- .travis.yml | 22 +++++++--------------- tox.ini | 12 ++++-------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index aec391e..cdf877b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/tox.ini b/tox.ini index 6600a53..94e6605 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [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 = @@ -11,8 +11,4 @@ deps = 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