Update to v19.2.11

mycroft/skills/__main__.py

@@ -64,9 +64,12 @@ def _starting_up():
 
     # Create the Intent manager, which converts utterances to intents
     # This is the heart of the voice invoked skill system
-
     service = IntentService(bus)
-    PadatiousService(bus, service)
+    try:
+        PadatiousService(bus, service)
+    except Exception as e:
+        LOG.exception('Failed to create padatious handlers '
+                      '({})'.format(repr(e)))
     event_scheduler = EventScheduler(bus)
 
     # Create a thread that monitors the loaded skills, looking for updates

mycroft/skills/core.py

@@ -111,6 +111,8 @@ def load_skill(skill_descriptor, bus, skill_id, BLACKLISTED_SKILLS=None):
         skill_descriptor: descriptor of skill to load
         bus:              Mycroft messagebus connection
         skill_id:         id number for skill
+        use_settings:     (default True) selects if the skill should create
+                          a settings object.
 
     Returns:
         MycroftSkill: the loaded skill or None on failure
@@ -475,12 +477,15 @@ class MycroftSkill:
     Skills implementation.
     """
 
-    def __init__(self, name=None, bus=None):
+    def __init__(self, name=None, bus=None, use_settings=True):
         self.name = name or self.__class__.__name__
         self.resting_name = None
         # Get directory of skill
         self._dir = dirname(abspath(sys.modules[self.__module__].__file__))
-        self.settings = SkillSettings(self._dir, self.name)
+        if use_settings:
+            self.settings = SkillSettings(self._dir, self.name)
+        else:
+            self.settings = None
 
         self.gui = SkillGUI(self)
 
@@ -1714,8 +1719,8 @@ class FallbackSkill(MycroftSkill):
     """
     fallback_handlers = {}
 
-    def __init__(self, name=None, bus=None):
-        MycroftSkill.__init__(self, name, bus)
+    def __init__(self, name=None, bus=None, use_settings=True):
+        MycroftSkill.__init__(self, name, bus, use_settings)
 
         #  list of fallback handlers registered by this instance
         self.instance_fallback_handlers = []

mycroft/skills/padatious_service.py

@@ -33,7 +33,7 @@ class PadatiousService(FallbackSkill):
     fallback_loose_match = 89  # Fallback priority for the conf > 0.5 match
 
     def __init__(self, bus, service):
-        FallbackSkill.__init__(self)
+        FallbackSkill.__init__(self, use_settings=False)
         if not PadatiousService.instance:
             PadatiousService.instance = self
 

mycroft/version/__init__.py

@@ -25,7 +25,7 @@
 # START_VERSION_BLOCK
 CORE_VERSION_MAJOR = 19
 CORE_VERSION_MINOR = 2
-CORE_VERSION_BUILD = 10
+CORE_VERSION_BUILD = 11
 # END_VERSION_BLOCK
 
 CORE_VERSION_TUPLE = (CORE_VERSION_MAJOR,

requirements.txt

@@ -23,7 +23,7 @@ google-api-python-client==1.6.4
 fasteners==0.14.1
 PyYAML==3.13
 
-msm==0.7.5
+msm==0.7.6
 msk==0.3.12
 adapt-parser==0.3.2
 padatious==0.4.6

scripts/prepare-msm.sh

@@ -60,6 +60,6 @@ if [[ ${IS_TRAVIS} != true ]] ; then
 fi
 
 # fix ownership of ${mycroft_root_dir} if it is not owned by the ${setup_user}
-if [[ $( stat -c "%U:%G" ${mycroft_root_dir} ) != "${setup_user}:${setup_user}" ]] ; then
+if [[ $( stat -c "%U:%G" ${mycroft_root_dir} ) != "${setup_user}:${setup_group}" ]] ; then
     change_ownership
 fi