From 0d0ab2016abca959a3fb985033874554f807a8fe Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 1 Jan 2025 21:33:55 +0300 Subject: [PATCH] import python-pbr-5.11.1-10.el10 --- .gitignore | 2 +- .python-pbr.metadata | 2 +- SPECS/python-pbr.spec | 219 +++++++++++++++++++++++++++--------------- 3 files changed, 146 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 91d5dcf..2ca4722 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pbr-5.1.2.tar.gz +SOURCES/pbr-5.11.1.tar.gz diff --git a/.python-pbr.metadata b/.python-pbr.metadata index dea3aa7..4e83ed7 100644 --- a/.python-pbr.metadata +++ b/.python-pbr.metadata @@ -1 +1 @@ -f0858e5466c0fda62c8b672c56a970803599c702 SOURCES/pbr-5.1.2.tar.gz +78bcc06a316c01a9dd53ad41ffd96350cf7c9725 SOURCES/pbr-5.11.1.tar.gz diff --git a/SPECS/python-pbr.spec b/SPECS/python-pbr.spec index 9c70113..e25987b 100644 --- a/SPECS/python-pbr.spec +++ b/SPECS/python-pbr.spec @@ -1,25 +1,28 @@ %global pypi_name pbr +# Disable bootstrap +%bcond bootstrap 1 -%bcond_without bootstrap - -%if 0%{?fedora} || 0%{?rhel} > 7 -%global do_test 0 -%endif +# EPEL does not have the necessary testing dependencies +# During the bootstrap the test dependencies are not ready yet +%bcond tests %[%{defined fedora} && %{without bootstrap}] Name: python-%{pypi_name} -Version: 5.1.2 -Release: 3%{?dist} +Version: 5.11.1 +Release: 10%{?dist} Summary: Python Build Reasonableness -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: http://pypi.python.org/pypi/pbr Source0: https://pypi.io/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -%if %{without bootstrap} -BuildRequires: python3-sphinx >= 1.1.3 -BuildRequires: python3-openstackdocstheme +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: git-core +%if %{with tests} +BuildRequires: gcc +BuildRequires: gnupg2 %endif @@ -30,107 +33,173 @@ between all of the OpenStack projects. Around the time that OpenStack hit 18 different projects each with at least 3 active branches, it seems like a good time to make that code into a proper re-usable library. -%package -n python2-%{pypi_name} +%package -n python%{python3_pkgversion}-%{pypi_name} Summary: Python Build Reasonableness -%{?python_provide:%python_provide python2-%{pypi_name}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if 0%{?do_test} == 1 -BuildRequires: python2-coverage -BuildRequires: python2-hacking -BuildRequires: python2-mock -BuildRequires: python2-testrepository -BuildRequires: python2-testresources -BuildRequires: python2-testscenarios -BuildRequires: gcc -BuildRequires: git -BuildRequires: gnupg -%endif -Requires: python2-setuptools +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} + +Requires: python%{python3_pkgversion}-setuptools Requires: git-core -%description -n python2-%{pypi_name} +%description -n python%{python3_pkgversion}-%{pypi_name} Manage dynamic plugins for Python applications -%package -n python3-%{pypi_name} -Summary: Python Build Reasonableness -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -Requires: python3-setuptools -Requires: git-core +%generate_buildrequires +%pyproject_buildrequires %{?with_tests:-e %{default_toxenv}} %{!?with_bootstrap:-e docs} -%description -n python3-%{pypi_name} -Manage dynamic plugins for Python applications %prep -%setup -q -n %{pypi_name}-%{version} +%autosetup -n %{pypi_name}-%{version} -p1 -rm -rf {test-,}requirements.txt pbr.egg-info/requires.txt +sed -i '/^six.*/d' test-requirements.txt +sed -i 's/hacking.*/hacking/' test-requirements.txt +sed -i '/^six.*/d' doc/requirements.txt +sed -i '/^reno.*/d' doc/requirements.txt +sed -i 's/^sphinx!=.*/sphinx/' doc/requirements.txt +sed -i 's/^sphinxcontrib-apidoc.*/sphinxcontrib-apidoc/' doc/requirements.txt +sed -i 's/^openstackdocstheme.*/openstackdocstheme/' doc/requirements.txt %build -export SKIP_PIP_INSTALL=1 -%py2_build -%py3_build +%pyproject_wheel %if %{without bootstrap} # generate html docs -sphinx-build doc/source html +PYTHONPATH=%{pyproject_build_lib} sphinx-build doc/source html # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} %endif %install -# Must do the python3 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version -# to be the default for now). -%py3_install -rm -rf %{buildroot}%{python3_sitelib}/pbr/tests +%pyproject_install +%pyproject_save_files %{pypi_name} mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-3 +ln -s ./pbr-3 %{buildroot}%{_bindir}/pbr -%py2_install -rm -rf %{buildroot}%{python2_sitelib}/pbr/tests -%if 0%{?do_test} +%if %{with tests} %check -%{__python2} setup.py test +export PYTHONDONTWRITEBYTECODE=1 +# Exclude tests that require networking +%tox -e %{default_toxenv} -- -- -E 'test_requirement_parsing|test_pep_517_support' %endif -%files -n python2-%{pypi_name} +%files -n python%{python3_pkgversion}-pbr -f %{pyproject_files} %license LICENSE -%doc README.rst -%if %{without bootstrap} -%doc html README.rst -%endif +%doc README.rst %{?without_bootstrap:html} %{_bindir}/pbr -%{python2_sitelib}/*.egg-info -%{python2_sitelib}/%{pypi_name} - -%files -n python3-pbr -%license LICENSE -%doc README.rst -%if %{without bootstrap} -%doc html README.rst -%endif %{_bindir}/pbr-3 -%{python3_sitelib}/*.egg-info -%{python3_sitelib}/%{pypi_name} %changelog -* Thu Jan 25 2024 Sergey Cherevko - 5.1.2-3 -- Rebuilt for MSVSphere 8.9 +* Wed Jan 01 2025 Arkady L. Shane - 5.11.1-10 +- Rebuilt for MSVSphere 10 + +* Wed Jul 24 2024 Miroslav Suchý - 5.11.1-10 +- convert license to SPDX + +* Fri Jul 19 2024 Fedora Release Engineering - 5.11.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 5.11.1-8 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 5.11.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Oct 20 2023 Karolina Surma - 5.11.1-5 +- When boostrapping the package switch off the tests + +* Fri Jul 21 2023 Fedora Release Engineering - 5.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 14 2023 Python Maint - 5.11.1-3 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 5.11.1-2 +- Bootstrap for Python 3.12 + +* Thu Feb 09 2023 Joel Capitao - 5.11.1-1 +- Update to latest upstream (#2136463) + +* Fri Jan 20 2023 Fedora Release Engineering - 5.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 17 2022 Joel Capitao - 5.10.0-1 +- Update to 5.10.0. Fixes rhbz#2117702 + +* Sat Jul 23 2022 Maxwell G - 5.9.0-1 +- Update to 5.9.0. Fixes rhbz#2020182. +- Re-enable unit tests + +* Fri Jul 22 2022 Fedora Release Engineering - 5.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 16 2022 Python Maint - 5.6.0-5 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 5.6.0-4 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 5.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Joel Capitao - 5.6.0-1 +- Update to latest release (#1953661) +- Use git-core as BR instead of git + +* Fri Jun 04 2021 Python Maint - 5.5.1-4 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 5.5.1-3 +- Bootstrap for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 5.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 29 2020 Joel Capitao - 5.5.1-1 +- Update to 5.5.1 (rhbz#1684239) + +* Mon Sep 14 2020 Joel Capitao - 5.5.0-1 +- Update to 5.5.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 5.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 5.4.3-5 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 5.4.3-4 +- Bootstrap for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 5.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 18 2019 Miro Hrončok - 5.4.3-2 +- Subpackage python2-pbr has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Tue Sep 10 2019 Yatin Karel - 5.4.3-1 +- Update to 5.4.3 + +* Sat Aug 17 2019 Miro Hrončok - 5.1.2-7 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 5.1.2-6 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 5.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Mon Jun 24 2019 Yatin Karel - 5.1.2-3 - Fix FTBFS: No more python2-openstackdocstheme -* Tue Jun 18 2019 Troy Dawson - 5.1.2-2.1 -- Bootstrap for EPEL8 - * Thu Feb 07 2019 Javier Peña - 5.1.2-2 - Fix doc requirements