MycroftOS: Bump Mycroft to 18.8.11 and remove UTF-8 patch (now in mainline)

This commit is contained in:
Peter Steenbergen 2019-01-31 15:41:39 +01:00
parent c336a9d9eb
commit 4f109ce009
3 changed files with 2 additions and 26 deletions

View File

@ -1,25 +0,0 @@
From 28a9ff65a9b71ad70b906d688b7b2f593ea108cc Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 5 Oct 2018 09:42:55 +0200
Subject: [PATCH 1/1] Enforce UTF8 encoding
---
mycroft/dialog/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mycroft/dialog/__init__.py b/mycroft/dialog/__init__.py
index 59b4a44a0d..59c521b929 100644
--- a/mycroft/dialog/__init__.py
+++ b/mycroft/dialog/__init__.py
@@ -45,7 +45,7 @@ class MustacheDialogRenderer(object):
template_name (str): a unique identifier for a group of templates
filename (str): a fully qualified filename of a mustache template.
"""
- with open(filename, 'r') as f:
+ with open(filename, 'r', encoding='utf-8') as f:
for line in f:
template_text = line.strip()
if template_name not in self.templates:
--
2.11.0

View File

@ -5,3 +5,4 @@ sha256 42950284980d415d5cf75c91ad1e59080770cf82a12dc294f106b97fdf8c65c0 python-
sha256 35d6c2d6155ea9b1887b296164a8ee7f1abf8e58b192a4829aaa59a7592909fa python-mycroft-v18.8.5.tar.gz
sha256 14d936dea78379a58c80b2d8268be87e5e89b3147a6f48fa85c6db4c37dc8b56 python-mycroft-v18.8.10.tar.gz
sha256 f3a4dcfbf4690df6a885cab40c7069d67b61e8cd5d81f85cf892dd38b3902aff python-mycroft-v18.8.11.tar.gz
sha256 b7ddc81be63310c28bc5da1e39745429941311362364dc44b67e3bc69139bb94 python-mycroft-v18.8.12.tar.gz

View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = v18.8.11
PYTHON_MYCROFT_VERSION = v18.8.12
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES =