feat/bump_ovos_precise_runner (#4)

.github/workflows/build_tests.yml

@@ -1,4 +1,4 @@
-name: Run Build Tests
+name: Run tflite Build Tests
 on:
   push:
     branches:
@@ -20,16 +20,20 @@ on:
   workflow_dispatch:
 
 jobs:
-  build_tests:
+  lite_build_tests:
+    strategy:
+      max-parallel: 2
+      matrix:
+        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
       - name: Setup Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
       - name: Install Build Tools
         run: |
           python -m pip install build wheel
@@ -43,6 +47,6 @@ jobs:
       - name: Build Distribution Packages
         run: |
           python setup.py bdist_wheel
-      - name: Install package
+      - name: Install lite package
         run: |
-          pip install .
+          pip install .[tflite]

.github/workflows/build_tests_full.yml

@@ -0,0 +1,52 @@
+name: Run tensorflow Build Tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - dev
+    paths-ignore:
+      - 'replace_package_name/version.py'
+      - 'test/**'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'readme.md'
+      - 'scripts/**'
+  workflow_dispatch:
+
+jobs:
+  full_build_tests:
+    strategy:
+      max-parallel: 2
+      matrix:
+        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Build Tools
+        run: |
+          python -m pip install build wheel
+      - name: Install System Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt install python3-dev swig portaudio19-dev
+      - name: Build Source Packages
+        run: |
+          python setup.py sdist
+      - name: Build Distribution Packages
+        run: |
+          python setup.py bdist_wheel
+      - name: Install package
+        run: |
+          pip install .[full]

.github/workflows/license_tests.yml

@@ -1,15 +1,18 @@
 name: Run License Tests
 on:
   push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - dev
   workflow_dispatch:
 
 jobs:
   license_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.head_ref }}
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
@@ -20,16 +23,22 @@ jobs:
       - name: Install System Dependencies
         run: |
           sudo apt-get update
-          sudo apt install python3-dev swig portaudio19-dev
+          sudo apt install python3-dev swig libssl-dev portaudio19-dev
       - name: Install core repo
         run: |
-          pip install .
-      - name: Install licheck
-        run: |
-          pip install git+https://github.com/NeonJarbas/lichecker
-      - name: Install test dependencies
+          pip install .[tflite]
+      - name: Get explicit and transitive dependencies
         run: |
-          pip install pytest pytest-timeout pytest-cov
-      - name: Test Licenses
-        run: |
-          pytest test/license_tests.py
+          pip freeze > requirements-all.txt
+      - name: Check python
+        id: license_check_report
+        uses: pilosus/action-pip-license-checker@v0.5.0
+        with:
+          requirements: 'requirements-all.txt'
+          fail: 'Copyleft,Other,Error'
+          fails-only: true
+          exclude: '^(tqdm).*'
+          exclude-license: '^(Mozilla).*$'
+      - name: Print report
+        if: ${{ always() }}
+        run: echo "${{ steps.license_check_report.outputs.report }}"

.github/workflows/unit_tests.yml

@@ -32,25 +32,21 @@ on:
 
 jobs:
   unit_tests:
-    strategy:
-      max-parallel: 2
-      matrix:
-        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up python ${{ matrix.python-version }}
+      - name: Set up python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.8
       - name: Install System Dependencies
         run: |
           sudo apt-get update
-          sudo apt install python3-dev
+          sudo apt install python3-dev swig portaudio19-dev
           python -m pip install build wheel
       - name: Install core repo
         run: |
-          pip install .
+          pip install .[tflite]
       - name: Install test dependencies
         run: |
           pip install pytest pytest-timeout pytest-cov

.gitignore

@@ -0,0 +1,33 @@
+dev.env
+.dev_opts.json
+.idea
+*.code-workspace
+*.pyc
+*.swp
+*~
+mimic
+/skills
+pocketsphinx-python
+*.egg-info/
+build
+dist
+tornado.web
+tornado.ioloop
+mycroft/__version__.py
+scripts/logs/*
+logs/*
+.coverage
+/htmlcov
+test/audio_accuracy/data
+scripts/*.screen
+doc/_build/
+.installed
+.mypy_cache
+.vscode
+.theia
+.venv/
+
+# Created by unit tests
+test/unittests/skills/test_skill/settings.json
+test_conf.json
+.pytest_cache/

README.md

@@ -3,7 +3,10 @@ Mycroft wake word plugin for [precise-lite](https://github.com/OpenVoiceOS/preci
 
 ## Install
 
-`pip install ovos-ww-plugin-precise-lite`
+This package supports both tflite-runner and the full tensorflow.
+
+To install with tflite, use `pip install ovos-ww-plugin-precise-lite[tflite]`.
+For the full tensorflow use `pip install ovos-ww-plugin-precise-lite[full]`.
 
 ## Configuration
 

requirements/requirements.txt

@@ -1,3 +1,3 @@
-precise_lite_runner~=0.4
+precise_lite_runner~=0.4, >=0.4.1
 ovos-plugin-manager>=0.0.4
 ovos-utils>=0.0.14

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-from setuptools import setup
 import os
+
 from setuptools import setup
 
 BASEDIR = os.path.abspath(os.path.dirname(__file__))
@@ -65,6 +65,10 @@ def required(requirements_file):
     license='Apache-2.0',
     packages=['ovos_ww_plugin_precise_lite'],
     install_requires=required("requirements/requirements.txt"),
+    extras_require={
+        'tflite': ["tflite-runtime"],
+        'full': ["tensorflow"]
+    },
     zip_safe=True,
     classifiers=[
         'Development Status :: 3 - Alpha',