Skip to content

Commit

Permalink
Merge pull request #562 from OpenVoiceOS/release-0.2.0a1
Browse files Browse the repository at this point in the history
Release 0.2.0a1
  • Loading branch information
JarbasAl authored Oct 15, 2024
2 parents e603112 + 568f9ff commit cd21df7
Show file tree
Hide file tree
Showing 513 changed files with 646 additions and 1,616,270 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jobs:
- name: Install System Dependencies
run: |
sudo apt-get update
sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev
sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev python3-fann2
python -m pip install build wheel
- name: Build Source Packages
run: |
python setup.py sdist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/end2end_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Install test dependencies
run: |
pip install -r requirements/tests.txt
pip install ./test/unittests/common_query/ovos_tskill_fakewiki
pip install ./test/integrationtests/common_query/ovos_tskill_fakewiki
pip install ./test/end2end/skill-ovos-hello-world
pip install ./test/end2end/skill-ovos-fallback-unknown
pip install ./test/end2end/skill-ovos-slow-fallback
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Run Integration Tests
on:
pull_request:
branches:
- dev
- master
paths-ignore:
- 'ovos_core/version.py'
- 'examples/**'
- '.github/**'
- '.gitignore'
- 'LICENSE'
- 'CHANGELOG.md'
- 'MANIFEST.in'
- 'readme.md'
- 'scripts/**'
workflow_dispatch:

jobs:
integration_tests:
strategy:
max-parallel: 3
matrix:
python-version: [3.9]
runs-on: ubuntu-latest
timeout-minutes: 35
steps:
- uses: actions/checkout@v2
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install System Dependencies
run: |
sudo apt-get update
sudo apt install python3-dev swig
python -m pip install build wheel
- name: Install test dependencies
run: |
pip install -r requirements/tests.txt
pip install ./test/integrationtests/common_query/ovos_tskill_fakewiki
- name: Install core repo
run: |
pip install -e .[plugins]
- name: Run integration tests
run: |
pytest test/integrationtests
2 changes: 1 addition & 1 deletion .github/workflows/license_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
requirements: 'requirements-all.txt'
fail: 'Copyleft,Other,Error'
fails-only: true
exclude: '^(precise-runner|fann2|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone|zeroconf|mutagen).*'
exclude: '^(precise-runner|fann2|ovos-adapt-parser|ovos-padatious|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone|zeroconf|mutagen).*'
exclude-license: '^(Mozilla).*$'
- name: Print report
if: ${{ always() }}
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/mycroft_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Run Mycroft Tests
on:
pull_request:
branches:
- dev
paths-ignore:
- 'ovos_core/version.py'
- 'examples/**'
- '.github/**'
- '.gitignore'
- 'LICENSE'
- 'CHANGELOG.md'
- 'MANIFEST.in'
- 'readme.md'
- 'scripts/**'
workflow_dispatch:

jobs:
mycroft_tests:
strategy:
max-parallel: 3
matrix:
python-version: [3.9]
runs-on: ubuntu-latest
timeout-minutes: 35
steps:
- uses: actions/checkout@v2
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install System Dependencies
run: |
sudo apt-get update
sudo apt install python3-dev swig libssl-dev portaudio19-dev libpulse-dev
python -m pip install build wheel
- name: Install test dependencies
run: |
pip install -r requirements/tests.txt
- name: Install core repo
run: |
pip install -e .[mycroft,plugins,deprecated]
- name: Run mycroft compat tests
run: |
pytest test/backwards_compat
9 changes: 1 addition & 8 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,19 @@ jobs:
- name: Install test dependencies
run: |
pip install -r requirements/tests.txt
pip install ./test/unittests/common_query/ovos_tskill_fakewiki
- name: Install core repo
run: |
pip install -e .[mycroft,plugins]
- name: Run unittests
run: |
pytest --cov=ovos_core --cov-report xml test/unittests
# NOTE: additional pytest invocations should also add the --cov-append flag
# or they will overwrite previous invocations' coverage reports
# (for an example, see OVOS Skill Manager's workflow)
- name: Run integration tests
run: |
pytest --cov-append --cov=ovos_core --cov-report xml test/integrationtests
- name: Install padatious
run: |
sudo apt install libfann-dev
pip install .[lgpl]
- name: Run unittests with padatious
run: |
pytest --cov-append --cov=ovos_core --cov-report xml test/unittests/skills
pytest --cov-append --cov=ovos_core --cov-report xml test/unittests
- name: Upload coverage
env:
CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
Expand Down
16 changes: 10 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# Changelog

## [0.1.3a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.1.3a1) (2024-10-13)
## [0.2.0a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.0a1) (2024-10-14)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.1.2a1...0.1.3a1)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.1.4a1...0.2.0a1)

**Closed issues:**

- Standalone skill not working anymore [\#556](https://github.com/OpenVoiceOS/ovos-core/issues/556)

**Merged pull requests:**

- fix:version check [\#557](https://github.com/OpenVoiceOS/ovos-core/pull/557) ([JarbasAl](https://github.com/JarbasAl))
- feat/pipeline\_plugins\_opm [\#527](https://github.com/OpenVoiceOS/ovos-core/pull/527) ([JarbasAl](https://github.com/JarbasAl))

## [0.1.2a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.1.2a1) (2024-10-13)
## [0.1.4a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.1.4a1) (2024-10-14)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.1.1...0.1.2a1)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.1.3...0.1.4a1)

**Merged pull requests:**

- automations:split tests into 2 workflows [\#558](https://github.com/OpenVoiceOS/ovos-core/pull/558) ([JarbasAl](https://github.com/JarbasAl))
- fix:usage without skills installed [\#555](https://github.com/OpenVoiceOS/ovos-core/pull/555) ([JarbasAl](https://github.com/JarbasAl))



Expand Down
6 changes: 3 additions & 3 deletions mycroft/skills/intent_services/adapt_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
# limitations under the License.
#
"""An intent parsing service using the Adapt parser."""
from adapt.context import ContextManagerFrame
from adapt.engine import IntentDeterminationEngine
from ovos_adapt.context import ContextManagerFrame
from ovos_adapt.engine import IntentDeterminationEngine
from ovos_workshop.intents import IntentBuilder, Intent
from ovos_core.intent_services.adapt_service import ContextManager, AdaptService
from ovos_adapt.opm import ContextManager, AdaptPipeline as AdaptService


class AdaptIntent(IntentBuilder):
Expand Down
Loading

0 comments on commit cd21df7

Please sign in to comment.