Skip to content

Commit

Permalink
Try tox-travis and add Python 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
saimn committed Sep 16, 2018
1 parent b84c0c9 commit 1a5bd4b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 27 deletions.
26 changes: 13 additions & 13 deletions .travis.yml
Expand Up @@ -2,16 +2,19 @@ language: python
cache: pip
sudo: false

env:
global:
- PILLOW="Pillow"
python:
- 3.6
- 3.5

matrix:
include:
- python: 3.5
env: PILLOW="Pillow==4.0.0"
- python: 3.7
dist: xenial
sudo: true
- python: 3.6

env: TOXENV=check
allow_failures:
- env: TOXENV=check

addons:
apt:
Expand All @@ -26,19 +29,16 @@ addons:
- libjpeg8-dev
- zlib1g-dev

install:
- pip install -U pip setuptools wheel
- pip install -q $PILLOW
- pip install pytest pytest-cov codecov feedgenerator zopfli brotli
- pip install .
install: pip install -U tox-travis

before_script:
ffmpeg --help

script: py.test -sv --cov sigal --cov-report term-missing tests/
script: tox

after_success:
codecov
- pip install codecov
- codecov

notifications:
irc: "chat.freenode.net#sigal"
3 changes: 0 additions & 3 deletions requirements.txt
@@ -1,4 +1,3 @@
alabaster
blinker
boto
brotli
Expand All @@ -11,6 +10,4 @@ Pillow
pilkit
pytest
pytest-cov
Sphinx
twine
zopfli
20 changes: 9 additions & 11 deletions tox.ini
@@ -1,23 +1,21 @@
[tox]
envlist = py{35,36},report,check
envlist = py{35,36,37},check
skip_missing_interpreters = True

[travis]
python =
3.7: py37
3.6: py36
3.5: py35

[testenv]
commands = pytest --cov sigal --cov-report term-missing
deps =
-r {toxinidir}/requirements.txt
pytest
pytest-cov

[testenv:report]
basepython = python3.6
commands =
coverage combine
coverage report
usedevelop = true
deps = coverage
commands = pytest --cov sigal --cov-report term-missing tests/

[testenv:check]
basepython = python3.6
deps =
docutils
check-manifest
Expand Down

0 comments on commit 1a5bd4b

Please sign in to comment.