Compare commits

...

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

2
.gitignore vendored

@ -1 +1 @@
SOURCES/pyparsing-2.4.7.tar.gz
SOURCES/pyparsing-3.1.1.tar.gz

@ -1 +1 @@
b1ce3d1aa0314e2e6a5356dcd9624b4e8adff84e SOURCES/pyparsing-2.4.7.tar.gz
2e9cf056c36c132f15476dfdd50449d48b48f6a2 SOURCES/pyparsing-3.1.1.tar.gz

@ -0,0 +1,20 @@
From: InSync <122007197+InSyncWithFoo@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:04:57 +0000
Subject: [PATCH] Avoid assigning an empty error message to delegated parse
exception
diff --git a/pyparsing/core.py b/pyparsing/core.py
index 73514ed..fc19d1c 100644
--- a/pyparsing/core.py
+++ b/pyparsing/core.py
@@ -4569,7 +4569,8 @@ class ParseElementEnhance(ParserElement):
return self.expr._parse(instring, loc, doActions, callPreParse=False)
except ParseBaseException as pbe:
if not isinstance(self, Forward) or self.customName is not None:
- pbe.msg = self.errmsg
+ if self.errmsg:
+ pbe.msg = self.errmsg
raise
else:
raise ParseException(instring, loc, "No expression defined", self)

@ -1,87 +1,88 @@
%global srcname pyparsing
%global _summary Python package with an object-oriented approach to text processing
%global build_wheel 1
%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
# when bootstrapping Python 3, pyparsing needs to be rebuilt before sphinx
%bcond_without doc
Summary: %{_summary}
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 7;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
Summary: Python package with an object-oriented approach to text processing
Name: pyparsing
Version: 2.4.7
Release: 9%{?dist}
Version: 3.1.1
Release: %autorelease
# SPDX
License: MIT
URL: https://github.com/pyparsing/pyparsing
Source0: https://github.com/%{name}/%{name}/archive/%{name}_%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch1: pyparsing-0001-Avoid-assigning-an-empty-error-message-to-delegated-.patch
BuildArch: noarch
BuildRequires: dos2unix
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
# python3 bootstrap: this is rebuilt before the final build of python3, which
# python3 bootstrap: this is built before the final build of python3, which
# adds the dependency on python3-rpm-generators, so we require it manually
# (python BuildRequires systemtap-sdt-devel which requires python3-pyparsing)
BuildRequires: python3-rpm-generators
# We need those for the same reason:
%bcond doc 1
%bcond tests 1
BuildRequires: python%{python3_pkgversion}-devel
%if %{with doc}
BuildRequires: python%{python3_pkgversion}-sphinx
%endif
%if 0%{?build_wheel}
BuildRequires: python%{python3_pkgversion}-pip
BuildRequires: python%{python3_pkgversion}-wheel
%if %{with tests}
BuildRequires: python%{python3_pkgversion}-pytest
%endif
%description
pyparsing is a module that can be used to easily and directly configure syntax
definitions for any number of text parsing applications.
%package -n python%{python3_pkgversion}-pyparsing
Summary: %{summary}
%description -n python%{python3_pkgversion}-pyparsing
pyparsing is a module that can be used to easily and directly configure syntax
definitions for any number of text parsing applications.
%if %{with doc}
%package doc
Summary: Documentation for pyparsing python package
Summary: Documentation for %{name}
# Most examples are under the project's license, MIT
# pymicko.py is under GPLv3+
# snmp_api.h is under CMU-UC (MIT)
# sparser.py is under GPLv2+
# searchparser.py is under BSD (3-clause, with advertising)
# btpyparse.py is under "Simplified BSD license"
License: MIT and GPLv2+ and GPLv3+ and BSD
# pymicko.py is under GPL-3.0-or-later
# snmp_api.h is under MIT-CMU
# sparser.py is under GPL-2.0-or-later
# searchparser.py and booleansearchparser.py are under BSD-3-Clause
# btpyparse.py is under "Simplified BSD license" -> BSD-2-Clause
License: MIT AND MIT-CMU AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause AND BSD-2-Clause
%description doc
The package contains documentation for pyparsing.
%endif
%package -n python%{python3_pkgversion}-pyparsing
Summary: %{_summary}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
%description -n python%{python3_pkgversion}-pyparsing
pyparsing is a module that can be used to easily and directly configure syntax
definitions for any number of text parsing applications.
%prep
%autosetup -p1
This is the Python 3 version.
dos2unix -k examples/*
%prep
%setup -q -n %{name}-%{name}_%{version}
dos2unix -k CHANGES LICENSE
%generate_buildrequires
%pyproject_buildrequires
%build
%if 0%{?build_wheel}
%py3_build_wheel
%else
%py3_build
%endif
%pyproject_wheel
%if %{with doc}
# build docs
pushd docs
# Theme is not available
sed -i '/alabaster/d' conf.py
@ -89,25 +90,24 @@ sphinx-build -b html . html
popd
%endif
%install
%if 0%{?build_wheel}
%py3_install_wheel %{python_wheelname}
%else
%py3_install
%endif
%pyproject_install
%pyproject_save_files pyparsing
%check
%{__python3} unitTests.py
%{__python3} simple_unit_tests.py
%pyproject_check_import -e pyparsing.diagram
%if %{with tests}
# Exclude test_range_check, testEmptyExpressionsAreHandledProperly and the test_diagram.py module
# because they depend on python-railroad-diagrams
%pytest -v -k 'not test_range_check and not testEmptyExpressionsAreHandledProperly' --ignore tests/test_diagram.py
%endif
%files -n python%{python3_pkgversion}-pyparsing
%files -n python%{python3_pkgversion}-pyparsing -f %{pyproject_files}
%license LICENSE
%doc CHANGES README.rst
%{python3_sitelib}/pyparsing.py
%{python3_sitelib}/__pycache__/*
%{python3_sitelib}/pyparsing-*-info/
%if %{with doc}
%files doc
@ -117,24 +117,82 @@ popd
%changelog
* Wed Feb 16 2022 Tomas Orsava <torsava@redhat.com> - 2.4.7-9
- Add gating configuration and a simple smoke test
- Related: rhbz#1950291
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.1.1-7
- Bump release for October 2024 mass rebuild:
* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 2.4.7-8.1
- Add automatically generated Obsoletes tag with the python39- prefix
for smoother upgrade from RHEL8
- Related: rhbz#1990421
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.1.1-6
- Rebuilt for MSVSphere 10
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.7-7.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.1.1-6
- Bump release for June 2024 mass rebuild
* Thu May 27 2021 Petr Viktorin <pviktori@redhat.com> - 2.4.7-6.1
- Fix licence for examples shipped in pyparsing-doc
* Tue May 21 2024 Maurizio Lombardi <mlombard@redhat.com> - 3.1.1-5
- remove build dependency on python-railroad-diagrams
* Mon Feb 12 2024 Peter Lemenkov <lemenkov@gmail.com> - 3.1.1-4
- Fix regression in pyparsing 3.1.1
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Dec 16 2023 Terje Rosten <terje.rosten@ntnu.no> - 3.1.1-1
- Update to pyparsing 3.1.1. Closes rhbz#2215810.
- Use new source url
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jul 12 2023 Karolina Surma <ksurma@redhat.com> - 3.0.9-10
- Declare the license as an SPDX expression
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 3.0.9-9
- Rebuilt for Python 3.12
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.0.9-8
- Bootstrap for Python 3.12
* Tue Feb 07 2023 Miro Hrončok <miro@hroncok.cz> - 3.0.9-5
- Drop unneeded build dependency on coverage
* Tue Feb 07 2023 Miro Hrončok <miro@hroncok.cz> - 3.0.9-4
- Drop the bootstrap bcond
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.7-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.9-1
- Version 3.0.9 (rhbz#2016781)
* Fri Jul 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.7-18
- Reorder %%package stanzas so %%_summary is not necessary
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.4.7-12
- Rebuilt for Python 3.11
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.4.7-11
- Bootstrap for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 2.4.7-8
- Rebuilt for Python 3.10
* Tue Jun 01 2021 Python Maint <python-maint@redhat.com> - 2.4.7-7
- Bootstrap for Python 3.10
* Thu May 27 2021 Petr Viktorin <pviktori@redhat.com> - 2.4.7-6
- Fix licence for examples shipped in pyparsing-doc
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -352,3 +410,5 @@ popd
* Wed Aug 3 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.3-1
- Initial RPM release
## END: Generated by rpmautospec

Loading…
Cancel
Save