Permalink
Browse files

Update tox and travis

  • Loading branch information...
1 parent d007353 commit 792f701a73c0e87d0cd79497a285f2789c59c443 @lqez lqez committed Dec 4, 2015
Showing with 26 additions and 13 deletions.
  1. +11 −10 .travis.yml
  2. +1 −1 setup.py
  3. +14 −2 tox.ini
View
@@ -1,18 +1,19 @@
sudo: false
language: python
python:
- - 2.7
- - 3.4
- - 3.5
+ - "3.5"
env:
- - DJANGO_VERSION_LT=1.8
- - DJANGO_VERSION_LT=1.9
- - DJANGO_VERSION_LT=2.0
+ - TOXENV=py27-django17
+ - TOXENV=py34-django17
+ - TOXENV=py27-django18
+ - TOXENV=py34-django18
+ - TOXENV=py35-django18
+ - TOXENV=py27-django19
+ - TOXENV=py34-django19
+ - TOXENV=py35-django19
install:
- - pip install -q -U pip
- - pip install -q coveralls
- - pip install "django<$DJANGO_VERSION_LT"
+ - pip install -q -U pip setuptools tox coveralls
script:
- coverage run setup.py test
+ - tox
after_success:
coveralls
View
@@ -14,8 +14,8 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
View
@@ -1,5 +1,17 @@
[tox]
-envlist = py27, py33, py34
+envlist =
+ py{27,34,35}-django{17,18,19},
[testenv]
-commands = {envpython} setup.py test
+basepython =
+ py27: python2.7
+ py34: python3.4
+ py35: python3.5
+
+deps =
+ coverage
+ django17: Django<1.8
+ django18: Django<1.9
+ django19: Django<2.0
+
+commands = coverage run -a setup.py test

0 comments on commit 792f701

Please sign in to comment.