Remove dependencies pinned for stable release (#599)

Co-authored-by: Daniel McKnight <[email protected]>
NeonGeckoCom · Dec 29, 2023 · a1ae37a · a1ae37a
1 parent 7131a28
commit a1ae37a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 187 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -102,12 +102,3 @@ jobs:
         with:
           name: skills-module-test-results
           path: tests/skills-module-test-results.xml
-
-      - name: Test Resource Resolution
-        run: |
-          pytest test/test_res.py --doctest-modules --junitxml=tests/resource-resolution-test-results.xml
-      - name: Upload Resource Resolution test results
-        uses: actions/upload-artifact@v2
-        with:
-          name: resource-resolution-test-results
-          path: tests/resource-resolution-test-results.xml
diff --git a/neon_core/__init__.py b/neon_core/__init__.py
@@ -26,18 +26,10 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# import sys
 
-from neon_core.config import setup_resolve_resource_file, get_core_version
-from os.path import dirname
-
-
-# TODO: Deprecate below
-NEON_ROOT_PATH = dirname(__file__)
-# sys.path.append(NEON_ROOT_PATH)
-
-CORE_VERSION_STR = ""  # get_core_version()
-setup_resolve_resource_file()
-
-__all__ = ['NEON_ROOT_PATH',
-           'CORE_VERSION_STR']
+# TODO: Patching for ovos-core 0.0.7
+import ovos_utils.messagebus
+from ovos_utils.events import get_handler_name, create_wrapper, EventContainer
+ovos_utils.messagebus.get_handler_name = get_handler_name
+ovos_utils.messagebus.create_wrapper = create_wrapper
+ovos_utils.messagebus.EventContainer = EventContainer
diff --git a/neon_core/config.py b/neon_core/config.py
diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt
@@ -1,5 +1,5 @@
 # neon core modules
-neon_messagebus~=2.0
+neon_messagebus~=2.0,>=2.0.1a1
 neon_enclosure~=1.6,>=1.6.1
 neon_speech~=4.3
 neon_gui~=1.2,>=1.2.2

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -5,11 +5,11 @@ ovos-plugin-common-play~=0.0.5
 
 neon-utils[network]~=1.8,>=1.8.2
 
-ovos-utils~=0.0.35
-ovos-bus-client~=0.0.5
+ovos-utils~=0.0.37
+ovos-bus-client~=0.0.8
 neon-transformers~=0.2
-ovos-config~=0.0.11
-ovos-plugin-manager~=0.0.24
+ovos-config~=0.0.12
+ovos-plugin-manager~=0.0.25
 # Testing latest OPM
 ovos-backend-client~=0.0.6
 psutil~=5.6
@@ -28,16 +28,11 @@ neon-utterance-normalizer-plugin~=0.1
 # TODO: Patching test failures https://github.com/NeonGeckoCom/NeonCore/actions/runs/4888865255/jobs/8727164992?pr=422
 requests < 2.30.0
 
-# TODO: Pinning latest stable release
-ovos-workshop==0.0.12
-ovos-utils==0.0.36
-ovos-plugin-manager==0.0.24
-
 
 # TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps
 adapt-parser~=0.5
 padacioso~=0.1
-ovos-lingua-franca==0.4.8a7
+ovos-lingua-franca~=0.4.8a7
 ovos-phal-plugin-connectivity-events~=0.0.1
 padatious~=0.4.8
 fann2==1.0.7
diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt
@@ -1,7 +1,5 @@
 neon-skill-about~=1.0
-# neon-skill-date_time~=1.0,>=1.0.1a3
-neon-skill-date_time~=1.0
+neon-skill-date_time~=1.0,>=1.0.1a3
 neon-skill-demo~=1.0,>=1.0.2
-# neon-skill-device_controls~=1.0,>=1.0.1a4
-neon-skill-device_controls~=1.0
+neon-skill-device_controls~=1.0,>=1.0.1a4
 neon-skill-ip_address~=1.1
diff --git a/test/test_res.py b/test/test_res.py