Skip to content

Commit

Permalink
refactor the old patches module (#34)
Browse files Browse the repository at this point in the history
* feat/SkillNetworkRequirements

* rename args for clariy

* classproperty

* refactor the old patches module

deduplicate code between ovos-core and workshop

support get_response refactor

* fix __new__

* refactor/standalone_skill_class to avoid mycroft module import mess

* temp update workflows for unittests from open PRs

* fix setup.py

* .

* .

* metaclass for instanchecks

* metaclass for instanchecks

* get_response

* fix imports

* require ovos_lf

* move killable_intents support to base class

* inject skill features into vanila mycroft

* keep enums together

* fix metaclass

* tests

* tests

* tests

* mycroft-core compat

* mycroft-core compat

* mycroft-core compat

* bump outils

* bump outils

* make some props private

* Patch backwards compat. (#37)

* Cleanup logging for backwards-compat init

* Add flag to disable settings manager
Default AbstractApp base class to not use settings manager

* Pass `enable_settings_manager` kwarg from OVOSAbstractApplication init

* Fix settings manager init flag with unit tests

* Resolve bad import
Cleanup logging in init

* Resolve editor import errors

* Add `bus` setter for backwards-compat with unit test

* Cleanup import logic

* Skip SettingsManager test under mycroft-core

* Address PR feedback

* Annotate future test dependency change

* Fix comment formatting

* Port changes from #35 to base MycroftSkill class

* OVOSAbstractApplication  backwards-compat. (#38)

* Handle passed App configuration with unit tests

* Handle passed `gui` arg with unit test

* Override settings path for AbstractApplications
Mark passed settings init as deprecated

* Add settings test cases

* Port OpenVoiceOS/ovos-core#252

* Resolve Automated Test Failures (#39)

* Ignore setuptools bug failing pip-audit

* Improve tests to test expected behavior and not test quirks of out-of-scope implementations

* Patch BaseSkill methods to resolve ovos-core unit test failures (#40)

* Fix typo in port of #37

* Update `is_ovos` references to `ovos_utils`

* Remove unused `util` module

* Update `is_ovos` references

* Fix recursive call in instancecheck

* Fix isinstance checks

* Add FallbackSkill test case

* Port tests from ovos-core that apply to relocated code (#41)

* Port core skill tests (#42)

* Add `adapt` to test requirements

* Resolve broken import

* Update adapt test dependency

* Fix test relative import error

* Add resources for unit tests
Skip failing test

* Fix typo in skipped test

Co-authored-by: Daniel McKnight <[email protected]>
Co-authored-by: Daniel McKnight <[email protected]>
  • Loading branch information
3 people authored Jan 18, 2023
1 parent cc29b21 commit 0613836
Show file tree
Hide file tree
Showing 43 changed files with 3,757 additions and 1,612 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,8 @@ jobs:
- name: Install package
run: |
pip install .[all]
- uses: pypa/[email protected]
- uses: pypa/[email protected]
with:
# Ignore setuptools vulnerability we can't do much about
ignore-vulns: |
GHSA-r9hx-vwmv-q579
7 changes: 5 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ jobs:
- name: Install test dependencies
run: |
sudo apt install libssl-dev libfann-dev portaudio19-dev libpulse-dev
pip install ovos-core[skills_lgpl]>=0.0.4a44
pip install pytest pytest-timeout pytest-cov
# TODO: Update to pip spec after core PR is merged
pip install git+https://github.com/OpenVoiceOS/ovos-core@refactor/skill_class_from_workshop
pip install pytest pytest-timeout pytest-cov adapt-parser~=0.5
- name: Run unittests
run: |
pytest --cov=ovos_workshop --cov-report xml test/unittests
Expand All @@ -65,7 +66,9 @@ jobs:
- name: Replace ovos-core with mycroft-core
run: |
pip uninstall ovos-core -y
pip uninstall ovos-lingua-franca -y
pip install git+https://github.com/MycroftAI/mycroft-core
pip install .
- name: Run mycroft unittests
run: |
pytest --cov-append --cov=ovos_workshop --cov-report xml test/unittests
Expand Down
Loading

0 comments on commit 0613836

Please sign in to comment.