diff --git a/.gitignore b/.gitignore index 772c36a..c85553c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /parse-1.6.2.tar.gz /parse-1.6.4.tar.gz /parse-1.6.6.tar.gz +/parse-1.8.4.tar.gz diff --git a/parse-python-3.5-test.patch b/parse-python-3.5-test.patch deleted file mode 100644 index b46b700..0000000 --- a/parse-python-3.5-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c0368f526c3d84a149aed5fad179098138b06f66 Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 14 Dec 2015 09:58:19 +0000 -Subject: [PATCH] Fix test_too_many_fields with Python 3.5 - -Python versions before 3.5 had a limit of 100 groups in regular -expressions. This limit was removed during 3.5 development: - -http://bugs.python.org/issue22437 -https://hg.python.org/cpython/rev/0b85ea4bd1af - -The test_too_many_fields test asserts that the limit exists by -attempting to parse a string with 15 fields, which triggers the 100 -named groups limit. - -Adjust the test so that if first checks to see whether the limit of 100 -named groups exists, and only assert that parsing 15 fields fails if -that is the case. ---- - test_parse.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/test_parse.py b/test_parse.py -index c524349..1d50568 100755 ---- a/test_parse.py -+++ b/test_parse.py -@@ -6,6 +6,7 @@ See the end of the source file for the license of use. - - import unittest - from datetime import datetime, time -+import re - - import parse - -@@ -624,8 +625,13 @@ class TestParse(unittest.TestCase): - self.assertEqual(r.fixed[21], 'spam') - - def test_too_many_fields(self): -- p = parse.compile('{:ti}' * 15) -- self.assertRaises(parse.TooManyFields, p.parse, '') -+ # Python 3.5 removed the limit of 100 named groups in a regular expression, -+ # so only test for the exception if the limit exists. -+ try: -+ re.compile("".join("(?P{n}-)".format(n=i) for i in range(101))) -+ except AssertionError: -+ p = parse.compile('{:ti}' * 15) -+ self.assertRaises(parse.TooManyFields, p.parse, '') - - - class TestSearch(unittest.TestCase): --- -2.6.4 - diff --git a/python-parse.spec b/python-parse.spec index 0035a0f..34054a1 100644 --- a/python-parse.spec +++ b/python-parse.spec @@ -7,15 +7,13 @@ %endif Name: python-%{modname} -Version: 1.6.6 -Release: 10%{?dist} +Version: 1.8.4 +Release: 1%{?dist} Summary: Opposite of format() License: BSD URL: http://pypi.python.org/pypi/parse -Source0: http://pypi.python.org/packages/source/p/%{modname}/%{modname}-%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=1291218 -Patch0: parse-python-3.5-test.patch +Source0: %pypi_source %{modname} BuildArch: noarch @@ -82,6 +80,9 @@ chmod -x README.rst %endif %changelog +* Mon Jul 30 2018 Miro HronĨok - 1.8.4-1 +- Update to 1.8.4 + * Sat Jul 14 2018 Fedora Release Engineering - 1.6.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 54b3d90..8cefcd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11bc8c60a30fe52db4ac9a827653d0ca parse-1.6.6.tar.gz +SHA512 (parse-1.8.4.tar.gz) = 8031d422cc5fb8519ee9bf6f29bfb0891a24b7ac2b9823fcfa14703682464d2d5b7b3377581358c46595677990665a348d6875ed079a737b7d7477cf1add80e6