Update OVOS dependencies to allow 0.x versions (#77)

* Update OVOS dependencies to allow 0.x versions * Update skill.json * Troubleshoot unit test failures * Update skill.json * Validate fix in neon-utils * Update skill.json * Validate fix in neon-utils * Update skill.json * Troubleshoot unit test failure * Update skill.json * Troubleshoot unit test failure * Troubleshoot intent test failure * Update neon-utils to resolve failure * Update skill.json * Troubleshooting test failures * Update skill.json --------- Co-authored-by: Daniel McKnight <[email protected]> Co-authored-by: NeonDaniel <[email protected]>
NeonGeckoCom · Sep 13, 2024 · cc9baa7 · cc9baa7
1 parent 701f234
commit cc9baa7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/__init__.py b/__init__.py
@@ -479,6 +479,11 @@ def _get_timezone_from_neon_utils(locale: Union[dict, str]) -> \
         """
         if not locale:
             raise ValueError("Locale not specified")
+        if isinstance(locale, str):
+            # `get_coordinates` expects a dict location, but it will join it to
+            # a string before making the API call, so `locale` can be any
+            # location search string
+            locale = {"city": locale}
         coords = get_coordinates(locale)
         if coords == (-1, -1):
             return None

diff --git a/locale/uk-ua/vocab/what.day.is.it.intent b/locale/uk-ua/vocab/what.day.is.it.intent
@@ -1,4 +1,4 @@
-ти (знаєш) дату ((у|в) {location}|)
+ти знаєш дату ((у|в) {location}|)
 (скажи мені|я хочу знати|мені потрібно знати) дату ((у|в) {location}|)
 який сьогодні день( (у|в) {location}|)( {location})
 котра сьогодні (день|дата)( (у|в) {location}|)

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,9 @@
 pytz>=2022.1
 geocoder~=1.38
 timezonefinder~=5.2
-ovos-bus-client~=0.0.4
+ovos-bus-client~=0.0,>=0.0.4
 ovos-utils~=0.0, >=0.0.34
-neon-utils~=1.8,>=1.8.1
-ovos-workshop~=0.0.12
+# TODO: network patching dependency resolution
+neon-utils[network]~=1.8,>=1.11.1a3
+ovos-workshop~=0.0,>=0.0.12
 ovos-lingua-franca~=0.4
diff --git a/skill.json b/skill.json
@@ -16,11 +16,11 @@
     "requirements": {
         "python": [
             "geocoder~=1.38",
-            "neon-utils~=1.8,>=1.8.1",
-            "ovos-bus-client~=0.0.4",
+            "neon-utils[network]~=1.8,>=1.11.1a3",
+            "ovos-bus-client~=0.0,>=0.0.4",
             "ovos-lingua-franca~=0.4",
             "ovos-utils~=0.0, >=0.0.34",
-            "ovos-workshop~=0.0.12",
+            "ovos-workshop~=0.0,>=0.0.12",
             "pytz>=2022.1",
             "timezonefinder~=5.2"
         ],