feat/pipeline_plugins_opm

.github/workflows/build_tests.yml

@@ -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

.github/workflows/end2end_tests.yml

@@ -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

.github/workflows/integration_tests.yml

@@ -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

.github/workflows/license_tests.yml

@@ -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() }}

.github/workflows/mycroft_tests.yml

@@ -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

.github/workflows/unit_tests.yml

@@ -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}}

mycroft/skills/intent_services/adapt_service.py

@@ -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):