Skip to content

Commit

Permalink
Switch to pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
matthias-bach-by committed Nov 14, 2017
1 parent 72d2490 commit bfe1ca9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install:
- pip install -r requirements.txt
- pip install coveralls
- pip freeze
script: nosetests
script: pytest
after_success: coveralls
deploy:
provider: pypi
Expand Down
5 changes: 2 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@

# Test requirements
mock
nose
nose-progressive
coverage
pytest
pytest-cov

# Documentation build
sphinx
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ alabaster==0.7.10 # via sphinx
apipkg==1.4 # via execnet
argon2-cffi==16.3.0 # via passlib
babel==2.3.4 # via sphinx
blessings==1.6 # via nose-progressive
cffi==1.9.1 # via argon2-cffi
check-manifest==0.35 # via devpi-client
coverage==4.3.4
coverage==4.3.4 # via pytest-cov
devpi-client==2.7.0
devpi-common==3.0.1 # via devpi-client, devpi-server
devpi-server==4.2.1
Expand All @@ -23,17 +22,17 @@ itsdangerous==0.24 # via devpi-server
jinja2==2.9.5 # via sphinx
markupsafe==1.0 # via jinja2
mock==2.0.0
nose-progressive==1.5.1
nose==1.3.7
passlib[argon2]==1.7.1 # via devpi-server
pastedeploy==1.5.2 # via pyramid
pbr==2.0.0 # via mock
pkginfo==1.4.1 # via devpi-client
pluggy==0.4.0 # via devpi-server, tox
py==1.4.33 # via devpi-client, devpi-common, devpi-server, tox
py==1.4.33 # via devpi-client, devpi-common, devpi-server, pytest, tox
pycparser==2.17 # via cffi
pygments==2.2.0 # via sphinx
pyramid==1.8.3 # via devpi-server
pytest-cov==2.5.1
pytest==3.2.3
pytz==2016.10 # via babel
repoze.lru==0.6 # via devpi-server, pyramid
requests==2.13.0 # via devpi-common, sphinx
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[tool:pytest]
addopts = --cov-report= --cov=devpi_plumber tests

[nosetests]
with-coverage=True
cover-package=devpi_plumber
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
'test': ['devpi-server>=4.2.1'],
},
tests_require=[
'nose',
'nose-progressive',
'coverage',
'pytest',
'pytest-cov',
],
classifiers=[
'Development Status :: 4 - Beta',
Expand Down

0 comments on commit bfe1ca9

Please sign in to comment.