mirror of https://github.com/docker/compose.git
Use py.test as the test runner
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
parent
6ac617bae1
commit
c1ed1efde8
|
@ -1,5 +1,4 @@
|
|||
coverage==3.7.1
|
||||
flake8==2.3.0
|
||||
mock >= 1.0.1
|
||||
nose==1.3.4
|
||||
pep8==1.6.1
|
||||
mock>=1.0.1
|
||||
pytest==2.7.2
|
||||
pytest-cov==2.1.0
|
||||
|
|
5
setup.py
5
setup.py
|
@ -41,13 +41,10 @@ install_requires = [
|
|||
|
||||
|
||||
tests_require = [
|
||||
'nose',
|
||||
'flake8',
|
||||
'pytest',
|
||||
]
|
||||
|
||||
|
||||
if sys.version_info < (2, 7):
|
||||
tests_require.append('unittest2')
|
||||
if sys.version_info[:1] < (3,):
|
||||
tests_require.append('mock >= 1.0.1')
|
||||
|
||||
|
|
28
tox.ini
28
tox.ini
|
@ -8,10 +8,14 @@ passenv =
|
|||
setenv =
|
||||
HOME=/tmp
|
||||
deps =
|
||||
-rrequirements.txt
|
||||
-rrequirements-dev.txt
|
||||
commands =
|
||||
nosetests -v --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html {posargs}
|
||||
flake8 compose tests setup.py
|
||||
py.test -v \
|
||||
--cov=compose \
|
||||
--cov-report html \
|
||||
--cov-report term \
|
||||
--cov-config=tox.ini \
|
||||
{posargs}
|
||||
|
||||
[testenv:pre-commit]
|
||||
skip_install = True
|
||||
|
@ -21,16 +25,16 @@ commands =
|
|||
pre-commit install
|
||||
pre-commit run --all-files
|
||||
|
||||
[testenv:py27]
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
-rrequirements-dev.txt
|
||||
# Coverage configuration
|
||||
[run]
|
||||
branch = True
|
||||
|
||||
[testenv:py34]
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
flake8
|
||||
nose
|
||||
[report]
|
||||
show_missing = true
|
||||
|
||||
[html]
|
||||
directory = coverage-html
|
||||
# end coverage configuration
|
||||
|
||||
[flake8]
|
||||
# Allow really long lines for now
|
||||
|
|
Loading…
Reference in New Issue