From b2bd12eca22a2012fd4a93bfe0188bef43249f52 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 27 Jul 2021 16:04:05 +0200 Subject: [PATCH] Bump adapt parser --- .../0001-Simplify-setup.patch | 18 ++++++++--------- .../0002-Fix-storing-regex.patch | 20 ------------------- .../python-adapt-parser.hash | 2 +- .../python-adapt-parser.mk | 4 ++-- 4 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 buildroot-external/package/python-adapt-parser/0002-Fix-storing-regex.patch diff --git a/buildroot-external/package/python-adapt-parser/0001-Simplify-setup.patch b/buildroot-external/package/python-adapt-parser/0001-Simplify-setup.patch index 45163bb4..95aac4c7 100644 --- a/buildroot-external/package/python-adapt-parser/0001-Simplify-setup.patch +++ b/buildroot-external/package/python-adapt-parser/0001-Simplify-setup.patch @@ -1,6 +1,6 @@ -From 509d23d8abadba2561aec14998607fd9df45a512 Mon Sep 17 00:00:00 2001 +From d49aa5b51128d0bf38fb902a57d1965e8983af5f Mon Sep 17 00:00:00 2001 From: j1nx -Date: Fri, 18 Jun 2021 21:13:52 +0200 +Date: Tue, 27 Jul 2021 15:01:43 +0200 Subject: [PATCH 1/1] Simplify setup --- @@ -8,10 +8,10 @@ Subject: [PATCH 1/1] Simplify setup 1 file changed, 15 deletions(-) diff --git a/setup.py b/setup.py -index 36853d0..a9ae9b4 100644 +index 1de4f3a..de629bd 100644 --- a/setup.py +++ b/setup.py -@@ -18,26 +18,12 @@ __author__ = 'seanfitz' +@@ -18,25 +18,12 @@ __author__ = 'seanfitz' import os from setuptools import setup @@ -29,19 +29,19 @@ index 36853d0..a9ae9b4 100644 - setup( name="adapt-parser", - version="0.4.1", + version="0.5.1", author="Sean Fitzgerald", author_email="sean@fitzgeralds.me", description=("A text-to-intent parsing framework."), - long_description=long_description, -- long_description_content_type="text/markdown", + long_description_content_type="text/markdown", license=("Apache License 2.0"), keywords="natural language processing", - url="https://github.com/MycroftAI/adapt", -@@ -55,5 +41,4 @@ setup( +@@ -54,6 +41,4 @@ setup( + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', ], - +- - install_requires=required('requirements.txt') ) -- diff --git a/buildroot-external/package/python-adapt-parser/0002-Fix-storing-regex.patch b/buildroot-external/package/python-adapt-parser/0002-Fix-storing-regex.patch deleted file mode 100644 index 0929a2a8..00000000 --- a/buildroot-external/package/python-adapt-parser/0002-Fix-storing-regex.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 1c55e1253bbbc8d870ccecd61b1e4d3c4e2c672b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=85ke=20Forslund?= -Date: Wed, 23 Jun 2021 09:42:49 +0200 -Subject: [PATCH] Fix storing regex as string when cleaned - -diff --git a/adapt/engine.py b/adapt/engine.py -index 0f4b6d2..3c373a1 100644 ---- a/adapt/engine.py -+++ b/adapt/engine.py -@@ -235,9 +235,9 @@ def default_match_func(regexp): - self.regular_expressions_entities = [ - r for r in self.regular_expressions_entities if r not in matches - ] -- self._regex_strings = [ -+ self._regex_strings = { - r for r in self._regex_strings if r not in matching_patterns -- ] -+ } - - return len(matches) != 0 diff --git a/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash b/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash index 9f822d66..1be48cfd 100644 --- a/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash +++ b/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash @@ -1,2 +1,2 @@ # md5, sha256 from https://pypi.org/pypi/adapt-parser/json -sha256 5328ddf76953d04f8f542c8d496c8f3566850e51238653c5cc73f5580f745b65 adapt-parser-0.4.1.tar.gz +sha256 fdc73b34ffd94697c9b37be504585d6ae5f6eef665eb02eb86427d2080ea22f7 adapt-parser-0.5.1.tar.gz diff --git a/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk b/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk index 534b65ca..0555c413 100644 --- a/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk +++ b/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ADAPT_PARSER_VERSION = 0.4.1 +PYTHON_ADAPT_PARSER_VERSION = 0.5.1 PYTHON_ADAPT_PARSER_SOURCE = adapt-parser-$(PYTHON_ADAPT_PARSER_VERSION).tar.gz -PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/68/01/b14c1675cf281654485a15374a8ab7251426c07e7b9e7aa5553a9cf895b8 +PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/ea/f3/d1043da5dfe5b3cc5c02b0a62425d8d7231a43214ddbb6f20459b6be491c PYTHON_ADAPT_PARSER_SETUP_TYPE = setuptools $(eval $(python-package))