Refactor into a structure that supports editable installation (#83)

* Refactor into a structure that supports editable installation

* Fix resource file path in setup.py

* Update skill tests to prevent legacy skill loading

* Skip failing OVOS intent tests

* Comment out occasionally failing test case

* Try re-enabling OVOS Intent tests with updated `neon-minerva`

* Fix typo in neon-minerva test extra deps

* Update neon-minerva test dependency

Author: NeonDaniel

.github/workflows/skill_tests.yml

@@ -16,9 +16,12 @@ jobs:
       # TODO: Padacioso handling extra words with high-conf.
       test_padacioso: false
       test_padatious: true
+      skill_entrypoint: "skill-date_time.neongeckocom"
   skill_resource_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master
+    with:
+      skill_entrypoint: "skill-date_time.neongeckocom"
   skill_install_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_installation.yml@master
     with:
-      test_osm: false
+      test_osm: false

LICENSE

@@ -1,2 +1,2 @@
-neon-minerva[padatious]~=0.3
+neon-minerva[padatious]~=0.3,>=0.3.1a1
 ovos-lingua-franca>=0.4.8a3

requirements.txt requirements/requirements.txtrequirements.txt renamed to requirements/requirements.txt

@@ -37,7 +37,7 @@
 
 
 def get_requirements(requirements_filename: str):
-    requirements_file = path.join(BASE_PATH, requirements_filename)
+    requirements_file = path.join(BASE_PATH, "requirements", requirements_filename)
     with open(requirements_file, 'r', encoding='utf-8') as r:
         requirements = r.readlines()
     requirements = [r.strip() for r in requirements if r.strip()
@@ -59,7 +59,7 @@ def get_requirements(requirements_filename: str):
 
 def find_resource_files():
     resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex")
-    base_dir = BASE_PATH
+    base_dir = path.join(BASE_PATH, SKILL_PKG)
     package_data = ["skill.json"]
     for res in resource_base_dirs:
         if path.isdir(path.join(base_dir, res)):
@@ -89,12 +89,11 @@ def find_resource_files():
     url=f'https://github.com/NeonGeckoCom/{SKILL_NAME}',
     license='BSD-3-Clause',
     install_requires=get_requirements("requirements.txt"),
-    extras_require={"test": get_requirements("requirements/test.txt")},
+    extras_require={"test": get_requirements("test.txt")},
     author='Neongecko',
     author_email='developers@neon.ai',
     long_description=long_description,
     long_description_content_type="text/markdown",
-    package_dir={SKILL_PKG: ""},
     packages=[SKILL_PKG],
     package_data={SKILL_PKG: find_resource_files()},
     include_package_data=True,