Bump adapt parser

This commit is contained in:
j1nx 2021-07-27 16:04:05 +02:00
parent c1f0400560
commit b2bd12eca2
4 changed files with 12 additions and 32 deletions

View File

@ -1,6 +1,6 @@
From 509d23d8abadba2561aec14998607fd9df45a512 Mon Sep 17 00:00:00 2001 From d49aa5b51128d0bf38fb902a57d1965e8983af5f Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl> From: j1nx <p.steenbergen@j1nx.nl>
Date: Fri, 18 Jun 2021 21:13:52 +0200 Date: Tue, 27 Jul 2021 15:01:43 +0200
Subject: [PATCH 1/1] Simplify setup Subject: [PATCH 1/1] Simplify setup
--- ---
@ -8,10 +8,10 @@ Subject: [PATCH 1/1] Simplify setup
1 file changed, 15 deletions(-) 1 file changed, 15 deletions(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 36853d0..a9ae9b4 100644 index 1de4f3a..de629bd 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -18,26 +18,12 @@ __author__ = 'seanfitz' @@ -18,25 +18,12 @@ __author__ = 'seanfitz'
import os import os
from setuptools import setup from setuptools import setup
@ -29,19 +29,19 @@ index 36853d0..a9ae9b4 100644
- -
setup( setup(
name="adapt-parser", name="adapt-parser",
version="0.4.1", version="0.5.1",
author="Sean Fitzgerald", author="Sean Fitzgerald",
author_email="sean@fitzgeralds.me", author_email="sean@fitzgeralds.me",
description=("A text-to-intent parsing framework."), description=("A text-to-intent parsing framework."),
- long_description=long_description, - long_description=long_description,
- long_description_content_type="text/markdown", long_description_content_type="text/markdown",
license=("Apache License 2.0"), license=("Apache License 2.0"),
keywords="natural language processing", keywords="natural language processing",
url="https://github.com/MycroftAI/adapt", @@ -54,6 +41,4 @@ setup(
@@ -55,5 +41,4 @@ setup( 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.9',
], ],
-
- install_requires=required('requirements.txt') - install_requires=required('requirements.txt')
) )
-- --

View File

@ -1,20 +0,0 @@
From 1c55e1253bbbc8d870ccecd61b1e4d3c4e2c672b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85ke=20Forslund?= <ake.forslund@gmail.com>
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

View File

@ -1,2 +1,2 @@
# md5, sha256 from https://pypi.org/pypi/adapt-parser/json # 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

View File

@ -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_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 PYTHON_ADAPT_PARSER_SETUP_TYPE = setuptools
$(eval $(python-package)) $(eval $(python-package))