diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..07ff7b5 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,5 @@ +[run] +source = skosprovider_oe + +[report] +show_missing = True diff --git a/.travis.yml b/.travis.yml index 9068ee2..c205dba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/nose_cover.cfg b/nose_cover.cfg deleted file mode 100644 index 558928a..0000000 --- a/nose_cover.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[nosetests] -match=^test -nocapture=1 -cover-package=skosprovider_oe -with-coverage=1 -cover-erase=1 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index d4dd8bc..0000000 --- a/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[nosetests] -match=^test -nocapture=1 diff --git a/setup.py b/setup.py index 9440392..fb0219e 100755 --- a/setup.py +++ b/setup.py @@ -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', @@ -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' ], ) diff --git a/tox.ini b/tox.ini index 35a568a..7ab1f35 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,19 @@ [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] @@ -21,7 +21,7 @@ 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