From 0945016e59883eb97758af91408b160d68a38457 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 28 Jan 2018 14:27:53 +0100 Subject: [PATCH] Use tox-travis and drop support for Python 3.3. Also coverage. --- .gitignore | 1 + .travis.yml | 21 +++++++-------------- tox.ini | 13 +++++-------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 4f54c99..4a16086 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ docs/build/* .DS_Store .tox/ dist/ +build/ diff --git a/.travis.yml b/.travis.yml index a217eab..f5241db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,12 @@ language: python -python: 3.5 +python: +- 2.7 +- 3.4 +- 3.5 sudo: false -cache: - directories: - - "~/.cache/pip" -env: - matrix: - - TOXENV=py27-dj18 - - TOXENV=py34-dj18 - - TOXENV=py35-dj18 - - TOXENV=py27-dj111 - - TOXENV=py34-dj111 - - TOXENV=py35-dj111 +cache: pip install: -- pip install tox codecov +- pip install tox-travis codecov script: tox -v after_success: - codecov @@ -26,5 +19,5 @@ deploy: secure: TZJdf9naBzdkE+HDyhtoCIIc0ddEXLWW/VUD975gJUWQpOA69h4ZjCCQ6z21AZdrWczCUh6/cOLYYSoC9OeaHqF+Jzunn3iEomvdVRsW7SX7MAxTFUENQHF3S3j8fYlqIPWvNDOgxJ/AERisMUSZkRKWIYjEInYo31RoJ1ySN0w= on: tags: true - condition: "$TOXENV = py27-dj18" + python: 3.5 repo: jazzband/django-authority diff --git a/tox.ini b/tox.ini index fc98f9b..11c9fbc 100644 --- a/tox.ini +++ b/tox.ini @@ -3,18 +3,15 @@ skipsdist = True usedevelop = True minversion = 1.8 envlist = - py{27,33,34,35}-dj{18,19,110,111} + py{27,34,35}-dj{18,19,110,111} [testenv] -basepython = - py27: python2.7 - py33: python3.3 - py34: python3.4 - py35: python3.5 usedevelop = true -commands = python example/manage.py test authority exampleapp +commands = + coverage run -a --source=authority example/manage.py test authority exampleapp + coverage report deps = dj18: Django<1.9 dj19: Django<1.10 dj110: Django<1.11 - dj111: Django<1.12 + dj111: Django<2.0