diff options
| -rw-r--r-- | noxfile.py | 4 | ||||
| -rw-r--r-- | plugins/ext_test/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | plugins/ext_test/LICENSE | 21 | ||||
| -rw-r--r-- | plugins/ext_test/setup.py | 1 | ||||
| -rw-r--r-- | plugins/tasks.py | 9 |
5 files changed, 13 insertions, 28 deletions
@@ -16,7 +16,11 @@ def tests(session): session.install('invoke', './[test]') session.run('invoke', 'pytest', '--junit', '--no-pty') + # cd into test directory to run other unit test session.chdir('./plugins/ext_test') session.install('.[test]') session.run('invoke', 'pytest', '--junit', '--no-pty', '--append-cov') + + # return to top directory to submit coverage + session.chdir('../..') session.run('codecov') diff --git a/plugins/ext_test/CHANGELOG.md b/plugins/ext_test/CHANGELOG.md index c6eae3f7..c2880b64 100644 --- a/plugins/ext_test/CHANGELOG.md +++ b/plugins/ext_test/CHANGELOG.md @@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## 1.0.0 (2020-03-09) +## 0.2.0 (TBD) +- Relocated inside of cmd2 project +- Fixes to match cmd2 API changes + +## 0.1.0 (2020-03-09) ### Added - Initial contribution diff --git a/plugins/ext_test/LICENSE b/plugins/ext_test/LICENSE deleted file mode 100644 index b1784d5d..00000000 --- a/plugins/ext_test/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Jared Crapo - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/plugins/ext_test/setup.py b/plugins/ext_test/setup.py index 41d97316..71d87e49 100644 --- a/plugins/ext_test/setup.py +++ b/plugins/ext_test/setup.py @@ -13,6 +13,7 @@ with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: setuptools.setup( name='cmd2-ext-test', version='0.2.0', + # TODO: Figure out why this doesn't work on CI Server # use_scm_version={ # 'root': '../..', # 'relative_to': __file__, diff --git a/plugins/tasks.py b/plugins/tasks.py index 7edcc08d..1301accf 100644 --- a/plugins/tasks.py +++ b/plugins/tasks.py @@ -28,14 +28,11 @@ namespace.add_collection(namespace_clean, 'clean') ##### +@invoke.task(pre=[ext_test_tasks.pytest]) @invoke.task() -def pytest(_, junit=False, pty=True): +def pytest(_): """Run tests and code coverage using pytest""" - - iexec = invoke.Executor([]) - iexec.execute([ - invoke.call(ext_test_tasks.pytest, junit=junit, pty=pty, append_cov=True) - ]) + pass namespace.add_task(pytest) |