1.0.2 (#76)

NeonGeckoCom · Jul 10, 2024 · 75f3919 · 75f3919
2 parents 16aeafe + d8b9c2f
commit 75f3919
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,44 +1,25 @@
 # Changelog
 
-## [1.0.1a5](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.1a5) (2024-03-01)
+## [1.0.2](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.2) (2024-07-09)
 
-[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.1a4...1.0.1a5)
+[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.2a1...1.0.2)
 
-**Merged pull requests:**
-
-- Update neon-minerva test dependency to stable spec [\#71](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/71) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [1.0.1a4](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.1a4) (2024-02-05)
-
-[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.1a3...1.0.1a4)
-
-**Merged pull requests:**
-
-- Support ovos-utils 0.1 [\#70](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/70) ([NeonDaniel](https://github.com/NeonDaniel))
+**Closed issues:**
 
-## [1.0.1a3](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.1a3) (2024-01-15)
+- Resolve test failures [\#38](https://github.com/NeonGeckoCom/skill-caffeinewiz/issues/38)
 
-[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.1a2...1.0.1a3)
-
-**Merged pull requests:**
-
-- Update to use shared CommonQuery test class [\#69](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/69) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [1.0.1a2](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.1a2) (2024-01-09)
-
-[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.1a1...1.0.1a2)
-
-**Merged pull requests:**
+## [1.0.2a1](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.2a1) (2024-04-04)
 
-- Update to better handle CQS exceptions [\#67](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/67) ([NeonDaniel](https://github.com/NeonDaniel))
+[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.1...1.0.2a1)
 
-## [1.0.1a1](https://github.com/NeonGeckoCom/skill-caffeinewiz/tree/1.0.1a1) (2024-01-09)
+**Fixed bugs:**
 
-[Full Changelog](https://github.com/NeonGeckoCom/skill-caffeinewiz/compare/1.0.0...1.0.1a1)
+- \[BUG\] ValueError: not enough values to unpack \(expected 4, got 2\) [\#58](https://github.com/NeonGeckoCom/skill-caffeinewiz/issues/58)
+- Spoken error after "no" to "more\_drinks" [\#44](https://github.com/NeonGeckoCom/skill-caffeinewiz/issues/44)
 
 **Merged pull requests:**
 
-- Update Unit Tests [\#68](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/68) ([NeonDaniel](https://github.com/NeonDaniel))
+- Update deprecated references [\#74](https://github.com/NeonGeckoCom/skill-caffeinewiz/pull/74) ([NeonDaniel](https://github.com/NeonDaniel))
 
 
 

diff --git a/__init__.py b/__init__.py
@@ -83,8 +83,6 @@ def __init__(self, **kwargs):
         self.from_caffeine_informer = list()
         self._update_event = Event()
         CommonQuerySkill.__init__(self, **kwargs)
-        from neon_utils.signal_utils import init_signal_bus
-        init_signal_bus(self.bus)
 
     @classproperty
     def runtime_requirements(self):
@@ -271,9 +269,6 @@ def CQS_action(self, phrase, data):
             if len(results) == 1:
                 self.speak_dialog("stay_caffeinated")
             else:
-                # TODO: This is patching poor handling in get_response
-                from neon_utils.signal_utils import wait_for_signal_clear
-                wait_for_signal_clear("isSpeaking", 30)
                 if self.ask_yesno("more_drinks") == "yes":
                     LOG.info("YES")
                     self._speak_alternate_results(message, results)
@@ -361,10 +356,11 @@ def _speak_alternate_results(self, message, caff_list=None):
                 self.speak_dialog('multiple_drinks',
                                   {'drink': drink,
                                    'caffeine_content': caff_mg,
-                                   'caffeine_units': self.translate(
+                                   'caffeine_units': self.resources.render_dialog(
                                        'word_milligrams'),
                                    'drink_size': caff_vol,
-                                   'drink_units': self.translate(unit_dialog)})
+                                   'drink_units': self.resources.render_dialog(
+                                       unit_dialog)})
                 spoken.append(caff_list[i][0])
                 sleep(0.5)  # Prevent simultaneous speak inserts
             cnt = cnt + 1
@@ -561,7 +557,7 @@ def _generate_drink_dialog(self, drink: str,
         to_speak = self.dialog_renderer.render('drink_caffeine', {
             'drink': drink,
             'caffeine_content': caff_mg,
-            'caffeine_units': self.translate('word_milligrams'),
+            'caffeine_units': self.resources.render_dialog('word_milligrams'),
             'drink_size': caff_vol,
-            'drink_units': self.translate(unit_dialog)})
+            'drink_units': self.resources.render_dialog(unit_dialog)})
         return to_speak, results
diff --git a/version.py b/version.py
@@ -26,4 +26,4 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"