diff --git a/setup.cfg b/setup.cfg index 1c453376..4fc81ca2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,17 +6,6 @@ omit = cloudbridge/__init__.py parallel = True -[nosetests] -with-coverage=1 -cover-branches=1 -cover-package=cloudbridge -processes=5 -process-timeout=3000 -match=^[Tt]est -verbosity=2 -# When exceptions occur, filter only cloudbridge logs -logging-filter=cloudbridge - [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index e15b4eac..86f8ba3d 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ # httpretty is required with/for moto 1.0.0 or AWS tests fail REQS_DEV = ([ 'tox>=2.1.1', - 'nose', + 'pytest', 'moto>=3.1.18', 'sphinx>=1.3.1', 'pydevd', @@ -73,7 +73,6 @@ author='Galaxy and GVL Projects', author_email='help@genome.edu.au', url='http://cloudbridge.cloudve.org/', - setup_requires=['nose>=1.0'], install_requires=REQS_BASE, extras_require={ ':python_version<"3.3"': ['ipaddress'], diff --git a/tox.ini b/tox.ini index 0e3123e9..63956067 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,8 @@ envlist = {py3.10,pypy}-{aws,azure,gcp,openstack,mock},lint [testenv] -commands = # see setup.cfg for options sent to nosetests and coverage - nosetests -v --nocapture --nologcapture --logging-format='%(asctime)s [%(levelname)s] %(name)s: %(message)s' {posargs} +commands = # see setup.cfg for options sent to pytest and coverage + coverage run --source=cloudbridge -m pytest -n 5 tests/ -v {posargs} setenv = # Fix for moto import issue: https://github.com/travis-ci/travis-ci/issues/7940 BOTO_CONFIG=/dev/null @@ -30,8 +30,9 @@ passenv = mock: CB_IMAGE_AWS,CB_VM_TYPE_AWS,CB_PLACEMENT_AWS,AWS_ACCESS_KEY,AWS_SECRET_KEY deps = -rrequirements.txt - coverage<5 + coverage + pytest-xdist [testenv:lint] commands = flake8 cloudbridge tests setup.py -deps = flake8 \ No newline at end of file +deps = flake8