From 9d87f7289a8d2c8013054a1cc4915e90d90bb134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 9 Mar 2023 17:52:08 -0800 Subject: [PATCH 1/2] Use extras_require.test and pytest for test dependencies. --- .github/workflows/ci.yaml | 6 ++---- setup.cfg | 9 ++------- setup.py | 5 +++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8ef2e688..764c63e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,9 +28,7 @@ jobs: python-version: ${{matrix.python}} - name: Install dependencies run: | - python -m pip install --upgrade pip setuptools - python -m pip install PyYAML argparse empy rosdep vcstools catkin-pkg python-dateutil packaging - python -m pip install nose coverage pep8 + python -m pip install -U -e .[test] pytest-cov - name: Run tests run: | - BLOOM_VERBOSE=1 python setup.py nosetests -s --tests test + BLOOM_VERBOSE=1 python -m pytest test --cov diff --git a/setup.cfg b/setup.cfg index 4060ea44..032ab6e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,10 +6,5 @@ all_files = 1 [upload_sphinx] upload-dir = doc/build/html -# [nosetests] -# where=test -# with-coverage=0 -# cover-package=nose -# debug=nose.loader -# pdb=0 -# pdb-failures=0 +[tool:pytest] +junit_suite_naem = bloom diff --git a/setup.py b/setup.py index 8729e72f..f91e54de 100755 --- a/setup.py +++ b/setup.py @@ -36,6 +36,11 @@ }, include_package_data=True, install_requires=install_requires, + exras_require={ + 'test': [ + 'pep8', + 'pytest', + ]}, author='Tully Foote, William Woodall', author_email='tfoote@openrobotics.org, william@openrobotics.org', maintainer='William Woodall', From 7563d6f8e465814f33686ac26f5a98026307c1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 26 May 2023 15:47:55 -0700 Subject: [PATCH 2/2] Fix typo. :facepalm: Co-authored-by: Scott K Logan --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f91e54de..7d14e1ce 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ }, include_package_data=True, install_requires=install_requires, - exras_require={ + extras_require={ 'test': [ 'pep8', 'pytest',