diff --git a/pyparsing-2.2.0.tar.gz b/pyparsing-2.2.0.tar.gz deleted file mode 100644 index f979ca6..0000000 --- a/pyparsing-2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 -size 1232522 diff --git a/pyparsing-2.3.0.tar.gz b/pyparsing-2.3.0.tar.gz new file mode 100644 index 0000000..f6ad3f1 --- /dev/null +++ b/pyparsing-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592 +size 857644 diff --git a/python-pyparsing-doc.changes b/python-pyparsing-doc.changes index 70e8bd6..05fcb6e 100644 --- a/python-pyparsing-doc.changes +++ b/python-pyparsing-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 15 08:47:24 UTC 2018 - Tomáš Chvátal + +- Update to 2.3.0, see changelog of the main package + ------------------------------------------------------------------- Sat Aug 18 09:41:30 UTC 2018 - Matěj Cepl diff --git a/python-pyparsing-doc.spec b/python-pyparsing-doc.spec index 24b6b63..dcc7439 100644 --- a/python-pyparsing-doc.spec +++ b/python-pyparsing-doc.spec @@ -12,24 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define basename python-parsing -%define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyparsing-doc -Version: 2.2.0 +Version: 2.3.0 Release: 0 Summary: Grammar Parser Library for Python - Documentation License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later Group: Development/Libraries/Python -URL: http://pyparsing.wikispaces.com/ +URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz -BuildRequires: %{python_module base} BuildRequires: %{python_module nose} -Requires: %{basename} = %{version} +BuildRequires: dos2unix +BuildRequires: python-rpm-macros +Requires: python-pyparsing = %{version} BuildArch: noarch %python_subpackages @@ -39,13 +38,13 @@ simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code. -This package contains the documentation of %{basename} +This package contains the documentation. %prep %setup -q -n pyparsing-%{version} %build -sed -i 's/\r$//' LICENSE examples/* +dos2unix LICENSE examples/* htmldoc/* %install : @@ -55,6 +54,6 @@ sed -i 's/\r$//' LICENSE examples/* %files %{python_files} %license LICENSE -%doc docs/* examples +%doc htmldoc/* examples %changelog diff --git a/python-pyparsing.changes b/python-pyparsing.changes index b6cd5df..3fa1c01 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Nov 15 08:46:10 UTC 2018 - Tomáš Chvátal + +- Update to 2.3.0: + * Updates to migrate source repo to GitHub + * Fix deprecation warning in Python 3.7 re: importing collections.abc + * Fix Literal/Keyword bug raising IndexError instead of ParseException + * Added simple_unit_tests.py, as a collection of easy-to-follow unit + * tests for various classes and features of the pyparsing library. + * Primary intent is more to be instructional than actually rigorous + * testing. Complex tests can still be added in the unitTests.py file. + * New features added to the Regex class + +------------------------------------------------------------------- +Thu Nov 15 08:45:05 UTC 2018 - Tomáš Chvátal + +- Fix URL to point to existing github + ------------------------------------------------------------------- Sat Aug 18 09:41:30 UTC 2018 - Matěj Cepl diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 0b47875..81fcbbb 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -12,21 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyparsing -Version: 2.2.0 +Version: 2.3.0 Release: 0 Summary: Grammar Parser Library for Python License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later Group: Development/Languages/Python -URL: http://pyparsing.wikispaces.com/ +URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros # do not add dependencies on setuptools and ideally not even full "python"; @@ -47,11 +48,11 @@ code uses to construct the grammar directly in Python code. %prep %setup -q -n pyparsing-%{version} +# Fix wrong EOL encoding: +dos2unix CHANGES LICENSE README.md %build %python_build -# Fix wrong EOL encoding: -sed -i 's/\r$//' CHANGES LICENSE README examples/* %install %python_install @@ -63,7 +64,7 @@ cp -r pyparsing.egg-info %{buildroot}%{$python_sitelib}/pyparsing-%{version}-py% %files %{python_files} %license LICENSE -%doc CHANGES README +%doc CHANGES README.md %{python_sitelib}/pyparsing.py* %pycache_only %{python_sitelib}/__pycache__/* %{python_sitelib}/pyparsing-%{version}-py*.egg-info/