Skip to content

Commit

Permalink
Travis build update (#122)
Browse files Browse the repository at this point in the history
* use python3.5 for qa check
* display test skip reasons
* mock installation only required on python < 3.3
* upgrade setuptools on travis
* Override already installed setuptools
  • Loading branch information
thijstriemstra authored and rm-hull committed Sep 14, 2017
1 parent db75ad4 commit 204400c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ matrix:
env: TOXENV=py36
- python: 3.7-dev
env: TOXENV=py37
- python: 2.7
- python: 3.5
env: TOXENV=qa

install: pip install -U pip tox coveralls
install:
- pip install --upgrade --ignore-installed setuptools
- pip install --upgrade pip tox coveralls
script: tox -vv
after_success:
- coveralls
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def read_file(fname):
CHANGES = read_file("CHANGES.rst")
version = read_file("VERSION.txt").strip()
test_deps = [
"mock",
'mock;python_version<"3.3"',
"pytest>=3.1",
"pytest-cov"
]
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ skip_missing_interpreters = True
[testenv]
commands =
python setup.py install
coverage run -m py.test -v -r w
coverage run -m py.test -v -r wsx
coverage report
deps =
.[test]

[testenv:qa]
commands =
flake8
rstcheck README.rst
rstcheck README.rst CHANGES.rst CONTRIBUTING.rst
deps =
.[qa]

0 comments on commit 204400c

Please sign in to comment.