From da105ff4b2fbe405bc93876f9724cfe1d02bcc9bd244083a16f456599f53d5b6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 14 Mar 2017 21:32:04 +0000 Subject: [PATCH] =?UTF-8?q?-=20update=20to=202.2.0:=20=20=20-=20Bumped=20m?= =?UTF-8?q?inor=20version=20number=20to=20reflect=20compatibility=20issues?= =?UTF-8?q?=20with=20=20=20=20=20OneOrMore=20and=20ZeroOrMore=20bugfixes?= =?UTF-8?q?=20in=202.1.10.=20(2.1.10=20fixed=20a=20bug=20=20=20=20=20that?= =?UTF-8?q?=20was=20introduced=20in=202.1.4,=20but=20the=20fix=20could=20b?= =?UTF-8?q?reak=20code=20=20=20=20=20written=20against=202.1.4=20-=202.1.9?= =?UTF-8?q?.)=20=20=20-=20Updated=20setup.py=20to=20address=20recursive=20?= =?UTF-8?q?import=20problems=20now=20=20=20=20=20that=20pyparsing=20is=20p?= =?UTF-8?q?art=20of=20'packaging'=20(used=20by=20setuptools).=20=20=20=20?= =?UTF-8?q?=20Patch=20submitted=20by=20Joshua=20Root,=20much=20thanks!=20?= =?UTF-8?q?=20=20-=20Fixed=20KeyError=20issue=20reported=20by=20Yann=20Biz?= =?UTF-8?q?eul=20when=20using=20packrat=20=20=20=20=20parsing=20in=20the?= =?UTF-8?q?=20Graphite=20time=20series=20database,=20thanks=20Yann!=20=20?= =?UTF-8?q?=20-=20Fixed=20incorrect=20usages=20of=20'\'=20in=20literals,?= =?UTF-8?q?=20as=20described=20in=20=20=20=20=20https://docs.python.org/3/?= =?UTF-8?q?whatsnew/3.6.html#deprecated-python-behavior=20=20=20=20=20Patc?= =?UTF-8?q?h=20submitted=20by=20Ville=20Skytt=C3=A4=20-=20thanks!=20=20=20?= =?UTF-8?q?-=20Minor=20internal=20change=20when=20using=20'-'=20operator,?= =?UTF-8?q?=20to=20be=20compatible=20=20=20=20=20with=20ParserElement.stre?= =?UTF-8?q?amline()=20method.=20=20=20-=20Expanded=20infixNotation=20to=20?= =?UTF-8?q?accept=20a=20list=20or=20tuple=20of=20parse=20actions=20=20=20?= =?UTF-8?q?=20=20to=20attach=20to=20an=20operation.=20=20=20-=20New=20unit?= =?UTF-8?q?=20test=20added=20for=20dill=20support=20for=20storing=20pypars?= =?UTF-8?q?ing=20parsers.=20=20=20=20=20Ordinary=20Python=20pickle=20can?= =?UTF-8?q?=20be=20used=20to=20pickle=20pyparsing=20parsers=20as=20=20=20?= =?UTF-8?q?=20=20long=20as=20they=20do=20not=20use=20any=20parse=20actions?= =?UTF-8?q?.=20The=20'dill'=20module=20is=20an=20=20=20=20=20extension=20t?= =?UTF-8?q?o=20pickle=20which=20*does*=20support=20pickling=20of=20attache?= =?UTF-8?q?d=20-=20drop=20desetuptoolize.patch:=20this=20is=20not=20needed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=38 --- desetuptoolize.patch | 13 ------------- pyparsing-2.1.10.tar.gz | 3 --- pyparsing-2.2.0.tar.gz | 3 +++ python-pyparsing.changes | 26 ++++++++++++++++++++++++++ python-pyparsing.spec | 4 +--- 5 files changed, 30 insertions(+), 19 deletions(-) delete mode 100644 desetuptoolize.patch delete mode 100644 pyparsing-2.1.10.tar.gz create mode 100644 pyparsing-2.2.0.tar.gz 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