Refactor into a structure that supports editable installation

.github/workflows/skill_tests.yml

@@ -12,9 +12,13 @@ jobs:
     uses: neongeckocom/.github/.github/workflows/skill_tests.yml@master
   skill_intent_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@master
+    with:
+      skill_entrypoint: skill-personal.neongeckocom
   skill_resource_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master
+    with:
+      skill_entrypoint: skill-personal.neongeckocom
   skill_install_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_installation.yml@master
     with:
-      test_osm: false
+      test_osm: false

requirements/test.txt

@@ -1 +1 @@
-neon-minerva[padatious]~=0.3
+neon-minerva[padatious]~=0.3,>=0.3.1a2

setup.py

@@ -30,14 +30,14 @@
 from os import getenv, path, walk
 
 SKILL_NAME = "skill-personal"
-SKILL_PKG = SKILL_NAME.replace('-', '_')
+SKILL_PKG = "neon_" + SKILL_NAME.replace('-', '_')
 # skill_id=package_name:SkillClass
 PLUGIN_ENTRY_POINT = f'{SKILL_NAME}.neongeckocom={SKILL_PKG}:PersonalSkill'
 BASE_PATH = path.abspath(path.dirname(__file__))
 
 
 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,