Skip to content

Commit 041628d

Browse files
committed
Travis: use tox for testing
* Update the Travis CI testing configuration to use tox. * Drop testing of Python 2.6, 3.2, 3.3 * Add Python 3.4, 3.5, pypy3
1 parent 51b9e84 commit 041628d

4 files changed

Lines changed: 31 additions & 15 deletions

File tree

.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
*.egg-info
12
*.pyc
2-
.coverage
3-
.venv
4-
build
5-
dist
6-
extras
7-
iptools.egg-info
3+
/.coverage
4+
/.tox/
5+
/.venv/
6+
/build/
7+
/dist/
8+
/extras/
89
setuptools-*.egg

.travis.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
language: python
22
python:
3-
- "2.6"
43
- "2.7"
5-
- "3.2"
6-
- "3.3"
4+
- "3.4"
5+
- "3.5"
76
- "pypy"
7+
- "pypy3"
8+
sudo: false
9+
matrix:
10+
fast_finish: true
11+
812
install:
9-
- pip install .
10-
- pip install -r tests/requirements.txt
13+
- pip install wheel tox-travis
14+
- python setup.py install bdist_wheel
15+
- pip install ./dist/iptools-*.whl
1116
script:
12-
- flake8
13-
- nosetests
17+
- tox
18+
- tox --installpkg ./dist/iptools-*.whl
19+
1420
notifications:
1521
email:
1622
- travis-ci+python-iptools@bd808.com

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
[nosetests]
2+
verbosity=2
23
detailed-errors=1
34
with-coverage=1
45
with-doctest=1
56
cover-package=iptools
67
cover-html=1
78
cover-html-dir=docs/_build/cover
9+
cover-branches=1
810

911
[flake8]
10-
ignore=F821,E402
1112
count=1
1213
show-pep8=1
1314
show-source=1
1415
statistics=1
15-
exclude=build,dist,docs,*.egg,*.egg-info
16+
exclude=.tox,.venv,build,dist,docs,*.egg,*.egg-info
1617

1718
[wheel]
1819
universal = 1

tox.ini

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[tox]
2+
envlist = py27, py34, py35, pypy, pypy3
3+
4+
[testenv]
5+
deps = -r{toxinidir}/tests/requirements.txt
6+
commands =
7+
flake8
8+
nosetests

0 commit comments

Comments
 (0)