Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Switch to py.test
Browse files Browse the repository at this point in the history
  • Loading branch information
koenedaele committed Apr 15, 2014
1 parent e9bb648 commit 0ceb44d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 22 deletions.
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[run]
source = skosprovider_oe

[report]
show_missing = True
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ python:
- 2.6
- 2.7
- 3.2
- 3.3
install:
- python setup.py -q install
- pip install nose
- python setup.py -q develop
- pip install pytest pytest-cov coveralls
# Install unittest2 on 2.6
- "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi"
script: nosetests
script:
py.test --cov skosprovider_oe --cov-report term-missing skosprovider_oe/tests
after_success:
coveralls
6 changes: 0 additions & 6 deletions nose_cover.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
url='http://github.com/koenedaele/skosprovider_oe',
packages=packages,
package_data={'': ['LICENSE']},
package_dir={'skosprovider': 'skosprovider'},
package_dir={'skosprovider_oe': 'skosprovider_oe'},
include_package_data=True,
install_requires = requires,
license='MIT',
Expand All @@ -42,6 +42,7 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2'
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3'
],
)
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[tox]
envlist = py26, py27, py32, cover
envlist = py26, py27, py32, py33, cover

[testenv]
commands =
python setup.py develop
python setup.py nosetests -q
py.test skosprovider_oe/tests
deps =
nose
pytest

[testenv:py26]
commands =
python setup.py develop
python setup.py nosetests -q
py.test skosprovider_oe/tests
deps =
nose
pytest
unittest2

[testenv:cover]
basepython =
python2.7
commands =
python setup.py develop
python setup.py nosetests --config nose_cover.cfg
py.test --cov skosprovider_oe skosprovider_oe/tests
deps =
nose
coverage
pytest
pytest-cov

0 comments on commit 0ceb44d

Please sign in to comment.