diff --git a/desetuptoolize.patch b/desetuptoolize.patch deleted file mode 100644 index 8c45fde..0000000 --- a/desetuptoolize.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pyparsing-2.1.10/setup.py -=================================================================== ---- pyparsing-2.1.10.orig/setup.py -+++ pyparsing-2.1.10/setup.py -@@ -1,7 +1,7 @@ - #!/usr/bin/env python - - """Setup script for the pyparsing module distribution.""" --from setuptools import setup -+from distutils.core import setup - - import sys - import os diff --git a/pyparsing-2.1.10.tar.gz b/pyparsing-2.1.10.tar.gz deleted file mode 100644 index fae353e..0000000 --- a/pyparsing-2.1.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 -size 1230829 diff --git a/pyparsing-2.2.0.tar.gz b/pyparsing-2.2.0.tar.gz new file mode 100644 index 0000000..f979ca6 --- /dev/null +++ b/pyparsing-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 +size 1232522 diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 5cad9dc..2082c44 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Mar 14 21:27:44 UTC 2017 - dmueller@suse.com + +- update to 2.2.0: + - Bumped minor version number to reflect compatibility issues with + OneOrMore and ZeroOrMore bugfixes in 2.1.10. (2.1.10 fixed a bug + that was introduced in 2.1.4, but the fix could break code + written against 2.1.4 - 2.1.9.) + - Updated setup.py to address recursive import problems now + that pyparsing is part of 'packaging' (used by setuptools). + Patch submitted by Joshua Root, much thanks! + - Fixed KeyError issue reported by Yann Bizeul when using packrat + parsing in the Graphite time series database, thanks Yann! + - Fixed incorrect usages of '\' in literals, as described in + https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior + Patch submitted by Ville Skyttä - thanks! + - Minor internal change when using '-' operator, to be compatible + with ParserElement.streamline() method. + - Expanded infixNotation to accept a list or tuple of parse actions + to attach to an operation. + - New unit test added for dill support for storing pyparsing parsers. + Ordinary Python pickle can be used to pickle pyparsing parsers as + long as they do not use any parse actions. The 'dill' module is an + extension to pickle which *does* support pickling of attached +- drop desetuptoolize.patch: this is not needed + ------------------------------------------------------------------- Thu Feb 23 11:45:52 UTC 2017 - jmatejek@suse.com diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 3821de4..fae2257 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -19,14 +19,13 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyparsing -Version: 2.1.10 +Version: 2.2.0 Release: 0 Summary: Grammar Parser Library for Python License: MIT and GPL-2.0+ and GPL-3.0+ Group: Development/Languages/Python Url: http://pyparsing.wikispaces.com/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz -Patch0: desetuptoolize.patch BuildRequires: %{python_module base} BuildRequires: python-rpm-macros # do not add dependencies on setuptools and ideally not even full "python"; @@ -61,7 +60,6 @@ This package contains the documentation of %{name} %prep %setup -q -n pyparsing-%{version} -%patch0 -p1 %build %python_build