diff --git a/.gitignore b/.gitignore index fc000cf..ffb9bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /pyparsing-2.1.5.tar.gz /pyparsing-2.1.10.tar.gz /pyparsing-2.2.0.tar.gz +/pyparsing-2.3.0.tar.gz diff --git a/pyparsing.spec b/pyparsing.spec index 12776ef..77a5fcf 100644 --- a/pyparsing.spec +++ b/pyparsing.spec @@ -8,15 +8,16 @@ Summary: %{sum} Name: pyparsing -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.3.0 +Release: 1%{?dist} License: MIT -URL: http://pyparsing.wikispaces.com/ -Source0: http://downloads.sourceforge.net/pyparsing/pyparsing-%{version}.tar.gz +URL: https://github.com/pyparsing/pyparsing +Source0: https://github.com/%{name}/%{name}/archive/%{name}_%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: dos2unix +BuildRequires: epydoc BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python3-devel @@ -64,10 +65,11 @@ This is the Python 3 version. %prep -%setup -q -mv docs/pyparsingClassDiagram.PNG docs/pyparsingClassDiagram.png -rm docs/pyparsingClassDiagram.JPG -dos2unix -k CHANGES LICENSE README +%setup -q -n %{name}-%{name}_%{version} +mv pyparsingClassDiagram.PNG pyparsingClassDiagram.png +rm pyparsingClassDiagram.JPG +dos2unix -k CHANGES LICENSE README.md + %build %if 0%{?build_wheel} @@ -81,6 +83,10 @@ dos2unix -k CHANGES LICENSE README %py3_build %endif +# build docs +epydoc -v --name pyparsing -o htmldoc --inheritance listed --no-private --no-frames pyparsing.py + + %install %if 0%{?build_wheel} %py2_install_wheel %{python2_wheelname} @@ -94,24 +100,34 @@ dos2unix -k CHANGES LICENSE README %endif +%check +%{__python2} unitTests.py +%{__python3} unitTests.py +%{__python3} simple_unit_tests.py + + %files -n python2-pyparsing %license LICENSE -%doc CHANGES README +%doc CHANGES README.md %{python2_sitelib}/pyparsing.py* %{python2_sitelib}/pyparsing-*dist-info/ %files -n python3-pyparsing %license LICENSE -%doc CHANGES README LICENSE +%doc CHANGES README.md %{python3_sitelib}/pyparsing.py %{python3_sitelib}/__pycache__/* %{python3_sitelib}/pyparsing-*dist-info/ %files doc %license LICENSE -%doc CHANGES README HowToUsePyparsing.html docs examples htmldoc +%doc CHANGES README.md HowToUsePyparsing.html examples htmldoc + %changelog +* Thu Jan 10 2019 Dan HorĂ¡k - 2.3.0-1 +- Update to 2.3.0 + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 9a111d3..3863821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyparsing-2.2.0.tar.gz) = 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008 +SHA512 (pyparsing-2.3.0.tar.gz) = 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e