only need to do one PEP8 test, so removed the redundancy
added two tests to test setup.py using pip, to ensure that it actually installs as intended
This commit is contained in:
18
.travis.yml
18
.travis.yml
@@ -12,15 +12,17 @@ env:
|
|||||||
- OPENSSL=1.0.1
|
- OPENSSL=1.0.1
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
# add a pep8 test for python 2.7
|
# add a pep8 test
|
||||||
- python: 2.7
|
|
||||||
env: TOXENV=pep8
|
|
||||||
# add a py3pep8 test for python 3.x
|
|
||||||
- python: 3.4
|
- python: 3.4
|
||||||
env: TOXENV=py3pep8
|
env: TOXENV=pep8
|
||||||
|
# add a test of setup.py using python 3.4
|
||||||
|
- python: 3.4
|
||||||
|
env: TOXENV=setup
|
||||||
|
# add a setup.py test using python 2.7
|
||||||
|
- python: 2.7
|
||||||
|
env: TOXENV=setup27
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: TOXENV=pep8
|
- env: TOXENV=pep8
|
||||||
- env: TOXENV=py3pep8
|
|
||||||
# install requirements
|
# install requirements
|
||||||
install:
|
install:
|
||||||
# add the lucid repo for if we need OpenSSL 0.9.8
|
# add the lucid repo for if we need OpenSSL 0.9.8
|
||||||
@@ -37,6 +39,6 @@ before_script:
|
|||||||
# use setup.py to invoke testing via coveralls
|
# use setup.py to invoke testing via coveralls
|
||||||
script:
|
script:
|
||||||
- tox
|
- tox
|
||||||
# and report coverage to coveralls
|
# and report coverage to coveralls, but only if this was a pytest run
|
||||||
after_success:
|
after_success:
|
||||||
coveralls
|
if [[ "${TOXENV}" == "py"* ]]; then coveralls; fi
|
||||||
|
|||||||
18
tox.ini
18
tox.ini
@@ -1,5 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py27, py32, py33, py34, pep8, py3pep8
|
envlist = py27, py32, py33, py34, pep8, setup, setup27
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[pytest]
|
[pytest]
|
||||||
@@ -11,15 +11,13 @@ deps = -rrequirements-test.txt
|
|||||||
commands =
|
commands =
|
||||||
py.test --cov pgpy --cov-report term-missing tests/
|
py.test --cov pgpy --cov-report term-missing tests/
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:setup]
|
||||||
|
basepython = python3.4
|
||||||
|
commands = pip install .
|
||||||
|
|
||||||
|
[testenv:setup27]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps =
|
commands = pip install .
|
||||||
flake8
|
|
||||||
pep8-naming
|
|
||||||
skipsdist = True
|
|
||||||
commands =
|
|
||||||
flake8 --ignore=E201,E202,E221,E251,E265,E501 setup.py
|
|
||||||
flake8 --ignore=E201,E202,E501,E265 pgpy
|
|
||||||
|
|
||||||
[testenv:py3pep8]
|
[testenv:py3pep8]
|
||||||
basepython = python3.4
|
basepython = python3.4
|
||||||
@@ -28,4 +26,4 @@ deps =
|
|||||||
pep8-naming
|
pep8-naming
|
||||||
commands =
|
commands =
|
||||||
flake8 --ignore=E201,E202,E221,E251,E265,E501 setup.py
|
flake8 --ignore=E201,E202,E221,E251,E265,E501 setup.py
|
||||||
flake8 --ignore=E201,E202,E501,E265 pgpy
|
flake8 --ignore=E201,E202,E501,E265 pgpy
|
||||||
|
|||||||
Reference in New Issue
Block a user