diff --git a/limit-error-messages.patch b/limit-error-messages.patch deleted file mode 100644 index b6446ca..0000000 --- a/limit-error-messages.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e0826a2ec69bc3cf71ba7ca7945774d9213d7d5e Mon Sep 17 00:00:00 2001 -From: Kyle Sunden -Date: Wed, 5 Jul 2023 14:16:50 -0500 -Subject: [PATCH] Limit error message overriding when - ---- - pyparsing/core.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pyparsing/core.py b/pyparsing/core.py -index 8233f72c..bfbb391c 100644 ---- a/pyparsing/core.py -+++ b/pyparsing/core.py -@@ -4547,7 +4547,8 @@ def parseImpl(self, instring, loc, doActions=True): - try: - return self.expr._parse(instring, loc, doActions, callPreParse=False) - except ParseBaseException as pbe: -- pbe.msg = self.errmsg -+ if not isinstance(self, Forward) or self.customName is not None: -+ pbe.msg = self.errmsg - raise - else: - raise ParseException(instring, loc, "No expression defined", self) diff --git a/pyparsing-3.1.0.tar.gz b/pyparsing-3.1.0.tar.gz deleted file mode 100644 index 26793d3..0000000 --- a/pyparsing-3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edb662d6fe322d6e990b1594b5feaeadf806803359e3d4d42f11e295e588f0ea -size 882565 diff --git a/pyparsing-3.1.1.tar.gz b/pyparsing-3.1.1.tar.gz new file mode 100644 index 0000000..0f76838 --- /dev/null +++ b/pyparsing-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db +size 884814 diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 2853152..a8dfc40 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,7 +1,20 @@ +------------------------------------------------------------------- +Fri Dec 1 17:06:46 UTC 2023 - Dirk Müller + +- update to 3.1.1: + * Fixed regression in Word(min), reported by Ricardo Coccioli, + good catch! + * Fixed bug in bad exception messages raised by Forward + * Fixed regression in SkipTo, where ignored expressions were + not checked when looking for the target expression. + * Fixed type annotation for enable_packrat + * Some general internal code cleanup +- drop limit-error-messages.patch (upstream) + ------------------------------------------------------------------- Tue Jul 11 11:01:42 UTC 2023 - Markéta Machová -- Add upstream patch limit-error-messages.patch as a part of +- Add upstream patch limit-error-messages.patch as a part of a workaround for boo#1213007 ------------------------------------------------------------------- @@ -9,10 +22,10 @@ Sat Jul 1 13:52:01 UTC 2023 - Markéta Machová - update to 3.1.0 * API ENHANCEMENT: `Optional(expr)` may now be written as `expr | ""` - * Added new class property `identifier` to all Unicode set classes in - `pyparsing.unicode`, using the class's values for `cls.identchars` + * Added new class property `identifier` to all Unicode set classes in + `pyparsing.unicode`, using the class's values for `cls.identchars` and `cls.identbodychars`. - * ParseResults` now has a new method `deepcopy()`, in addition to the + * ParseResults` now has a new method `deepcopy()`, in addition to the current `copy()` method. * Reworked `delimited_list` function into the new `DelimitedList` class. * Added new class method `ParserElement.using_each` @@ -21,7 +34,7 @@ Sat Jul 1 13:52:01 UTC 2023 - Markéta Machová * `ParserElement.validate()` is deprecated. * Added bool `embed` argument to `ParserElement.create_diagram()`. * Added support for Python 3.12. - * Updated `create_diagram()` code to be compatible with + * Updated `create_diagram()` code to be compatible with railroad-diagrams package version 3.0. * Many other changes, see upstream CHANGES @@ -38,7 +51,7 @@ Thu Apr 13 22:43:50 UTC 2023 - Matej Cepl ------------------------------------------------------------------- Fri Feb 17 20:54:20 UTC 2023 - Dirk Müller -- do primary/all split only for tumbleweed (similar to flit-core) +- do primary/all split only for tumbleweed (similar to flit-core) ------------------------------------------------------------------- Thu Sep 15 22:00:29 UTC 2022 - Ben Greiner diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 0fad56b..de03c5c 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -56,14 +56,12 @@ ExclusiveArch: do-not-build %endif %{?sle15_python_module_pythons} Name: %{pprefix}-pyparsing%{?psuffix} -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: Grammar Parser Library for Python License: GPL-2.0-or-later AND MIT AND GPL-3.0-or-later URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz -#PATCH-FIX-UPSTREAM https://github.com/pyparsing/pyparsing/pull/493 Limit error message overriding -Patch: limit-error-messages.patch BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} BuildRequires: fdupes