From 17d4aae5a3a71561e8165f3c80d8fbfe8519fc71 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Jul 27 2022 10:35:33 +0000 Subject: Update to 6.4.2 Related-to: https://review.rdoproject.org/r/q/Idabd07759089ba931e2a516f86e3307223040d78 --- diff --git a/.python-coverage.metadata b/.python-coverage.metadata index 7450b8d..b7ae8c9 100644 --- a/.python-coverage.metadata +++ b/.python-coverage.metadata @@ -1 +1 @@ -ec7c2ee6eae78708bee08af8b85e03dd8d673ef2 SOURCES/coverage-4.5.1.tar.gz +c2b4980193ebae34e66f14310551f4d3001089db SOURCES/coverage-6.4.2.tar.gz diff --git a/SOURCES/.gitignore b/SOURCES/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/SOURCES/.gitignore diff --git a/SPECS/python-coverage.spec b/SPECS/python-coverage.spec index b6e83a5..beba133 100644 --- a/SPECS/python-coverage.spec +++ b/SPECS/python-coverage.spec @@ -1,9 +1,11 @@ -# %%global prever b1 +#global prever b1 + +%global py2support 0 Name: python-coverage Summary: Code coverage testing module for Python -Version: 4.5.1 -Release: 9%{?prever}%{?dist} +Version: 6.4.2 +Release: 2%{?dist} # jquery(MIT): # coverage/htmlfiles/jquery.min.js # MIT or GPL: @@ -12,8 +14,7 @@ Release: 9%{?prever}%{?dist} # coverage/htmlfiles/jquery.isonscreen.js License: ASL 2.0 and MIT and (MIT or GPL) URL: http://nedbatchelder.com/code/modules/coverage.html -Source0: http://pypi.python.org/packages/source/c/coverage/coverage-%{version}%{?prever}.tar.gz - +Source0: https://pypi.python.org/packages/source/c/coverage/coverage-%{version}%{?prever}.tar.gz BuildRequires: gcc %description @@ -22,135 +23,209 @@ execution. It uses the code analysis tools and tracing hooks provided in the Python standard library to determine which lines are executable, and which have been executed. -%package -n platform-python-coverage -Summary: Code coverage testing module for Python 3 -BuildRequires: python3-devel -BuildRequires: python3-setuptools +%{?python_extras_subpkg:%python_extras_subpkg -n python%{python3_pkgversion}-coverage -i %{python3_sitearch}/coverage*.egg-info toml} + +%if %{py2support} + +%package -n python2-coverage +Summary: Code coverage testing module for Python 2 +BuildRequires: python2-devel +BuildRequires: python2-setuptools # As the "coverage" executable requires the setuptools at runtime (#556290), # so the "python3-coverage" executable requires python3-setuptools: -%if 0%{?rhel} && 0%{?rhel} >= 8 -Requires: platform-python-setuptools -%else -Requires: python3-setuptools -%endif +Requires: python2-setuptools +%{?python_provide:%python_provide python2-coverage} Provides: bundled(js-jquery) = 1.11.1 Provides: bundled(js-jquery-debounce) = 1.1 Provides: bundled(js-jquery-hotkeys) = 0.8 Provides: bundled(js-jquery-isonscreen) = 1.2.0 Provides: bundled(js-jquery-tablesorter) -Conflicts: python3-coverage < 4.5.1-7%{?dist} - -%description -n platform-python-coverage -Coverage.py is a Python 3 module that measures code coverage during Python +%description -n python2-coverage +Coverage.py is a Python 2 module that measures code coverage during Python execution. It uses the code analysis tools and tracing hooks provided in the Python standard library to determine which lines are executable, and which have been executed. +%endif -%package -n python3-coverage +%package -n python%{python3_pkgversion}-coverage Summary: Code coverage testing module for Python 3 -Requires: platform-python-coverage = %{version}-%{release} - -# Require alternatives version that implements the --keep-foreign flag -Requires(postun): alternatives >= 1.19.1-1 -# For alternatives -Requires: python36 -Requires(post): python36 -Requires(postun): python36 - -%{?python_provide:%python_provide python3-coverage} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +# As the "coverage" executable requires the setuptools at runtime (#556290), +# so the "python3-coverage" executable requires python3-setuptools: +Requires: python%{python3_pkgversion}-setuptools +%{?python_provide:%python_provide python%{python3_pkgversion}-coverage} +Provides: bundled(js-jquery) = 1.11.1 +Provides: bundled(js-jquery-debounce) = 1.1 +Provides: bundled(js-jquery-hotkeys) = 0.8 +Provides: bundled(js-jquery-isonscreen) = 1.2.0 +Provides: bundled(js-jquery-tablesorter) +Conflicts: python2-coverage < 4.5.4-2 -%description -n python3-coverage +%description -n python%{python3_pkgversion}-coverage Coverage.py is a Python 3 module that measures code coverage during Python execution. It uses the code analysis tools and tracing hooks provided in the Python standard library to determine which lines are executable, and which have been executed. - %prep %setup -q -n coverage-%{version}%{?prever} find . -type f -exec chmod 0644 \{\} \; sed -i 's/\r//g' README.rst - %build +%if %{py2support} +%py2_build +%endif %py3_build %install +%if %{py2support} +%py2_install +rm %{buildroot}/%{_bindir}/coverage +%endif + %py3_install +rm %{buildroot}/%{_bindir}/coverage -# rename binaries, make compat symlinks +# make compat symlinks pushd %{buildroot}%{_bindir} -rm -rf coverage-3* coverage3 -mv coverage coverage-%{python3_version} - -# All ghost files controlled by alternatives need to exist for the files -# section check to succeed -touch coverage-3 +%if %{py2support} +ln -s coverage-%{python2_version} coverage-2 +%endif +ln -s coverage-%{python3_version} coverage-3 +ln -s coverage-%{python3_version} coverage popd +%if %{py2support} +%files -n python2-coverage +%license LICENSE.txt NOTICE.txt +%doc README.rst +%{_bindir}/coverage2 +%{_bindir}/coverage-2* +%{python2_sitearch}/coverage/ +%{python2_sitearch}/coverage*.egg-info/ +%endif -%post -n python3-coverage -alternatives --add-slave python3 %{_bindir}/python%{python3_version} \ - %{_bindir}/coverage-3 \ - coverage-3 \ - %{_bindir}/coverage-%{python3_version} - -%postun -n python3-coverage -# Do this only during uninstall process (not during update) -if [ $1 -eq 0 ]; then - alternatives --keep-foreign --remove-slave python3 \ - %{_bindir}/python%{python3_version} coverage-3 -fi - - -%files -n platform-python-coverage +%files -n python%{python3_pkgversion}-coverage %license LICENSE.txt NOTICE.txt %doc README.rst +%{_bindir}/coverage +%{_bindir}/coverage3 +%{_bindir}/coverage-3* %{python3_sitearch}/coverage/ %{python3_sitearch}/coverage*.egg-info/ -%files -n python3-coverage -%license LICENSE.txt NOTICE.txt -%doc README.rst -%{_bindir}/coverage-%{python3_version} -%ghost %{_bindir}/coverage-3 +%changelog +* Fri Jul 22 2022 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Fri Jul 15 2022 Miro Hrončok - 6.4.2-1 +- Update to 6.4.2 +- Fix coverage reporting for Python 3.11.0b4+ +- Fixes: rhbz#2049354 -%changelog -* Mon Aug 23 2021 Tomas Orsava - 4.5.1-9 -- Bump release to rebuild +* Mon Jun 13 2022 Python Maint - 6.3.3-2 +- Rebuilt for Python 3.11 + +* Wed May 18 2022 Tomáš Hrnčiar - 6.3.3-1 +- Update to 6.3.3 + +* Tue Jan 25 2022 Tom Callaway - 6.3-1 +- update to 6.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Dec 05 2021 Orion Poplawski - 6.2-1 +- Update to 6.2 + +* Mon Oct 04 2021 Charalampos Stratakis - 5.6-0.4b1 +- Provide the extra toml package (rhbz#2010422) + +* Tue Jul 27 2021 Fedora Release Engineering - 5.6-0.3b1 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 5.6-0.2b1 +- Rebuilt for Python 3.10 + +* Wed Apr 14 2021 Tom Callaway - 5.6-0.1.b1 +- 5.6b1 + +* Mon Mar 1 2021 Tom Callaway - 5.5-1 +- update to 5.5 + +* Tue Jan 26 2021 Tom Callaway - 5.4-1 +- update to 5.4 + +* Wed Dec 30 2020 Tom Callaway - 5.3.1-1 +- update to 5.3.1 + +* Mon Sep 14 2020 Tom Callaway - 5.3-1 +- update to 5.3 + +* Thu Aug 13 2020 Tom Callaway - 5.2.1-1 +- update to 5.2.1 + +* Wed Jul 29 2020 Fedora Release Engineering - 5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 9 2020 Tom Callaway - 5.2-1 +- update to 5.2 + +* Fri May 22 2020 Miro Hrončok - 5.1-2 +- Rebuilt for Python 3.9 + +* Mon Apr 13 2020 Tom Callaway - 5.1-1 +- update to 5.1 + +* Tue Mar 17 2020 Tom Callaway - 5.0.4-1 +- update to 5.0.4 + +* Thu Jan 30 2020 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 13 2020 Tom Callaway - 5.0.3-1 +- update to 5.0.3 + +* Mon Jan 6 2020 Tom Callaway - 5.0.2-1 +- update to 5.0.2 + +* Tue Nov 12 2019 Tom Callaway - 4.5.4-5 +- conditionalize (and disable) python2 support + +* Thu Oct 03 2019 Miro Hrončok - 4.5.4-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 4.5.4-3 +- Rebuilt for Python 3.8 -* Fri Jul 30 2021 Tomas Orsava - 4.5.1-8 -- Adjusted the postun scriptlets to enable upgrading to RHEL 9 -- Resolves: rhbz#1933055 +* Mon Aug 12 2019 Miro Hrončok - 4.5.4-2 +- Make /usr/bin/coverage Python 3 +- Remove /usr/bin/python*-coverage links to cleanse tab completion results +- Drop no longer needed Obsoletes for platform-python-coverage -* Wed Dec 12 2018 Tomas Orsava - 4.5.1-7 -- New subpackage platform-python-coverage without files from /usr/bin/* -- python3-coverage contains only files from /usr/bin/* and depends - on platform-python-coverage -- Resolves: rhbz#1658674 +* Mon Aug 5 2019 Tom Callaway - 4.5.4-1 +- update to 4.5.4 -* Fri Nov 16 2018 Lumír Balhar - 4.5.1-6 -- Require platform-python-setuptools instead of python3-setuptools -- Resolves: rhbz#1650532 +* Fri Jul 26 2019 Fedora Release Engineering - 4.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Tue Sep 25 2018 Lumír Balhar - 4.5.1-5 -- Add alternatives for coverage-3 -> coverage-3.6 -- Resolves: rhbz#1633547 +* Tue Apr 23 2019 Tom Callaway - 4.5.3-1 +- update to 4.5.3 -* Mon Aug 06 2018 Petr Viktorin - 4.5.1-4 -- Remove unversioned executables (only *-3.6 should be provided) +* Sat Feb 02 2019 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Mon Jul 09 2018 Petr Viktorin - 4.5.1-3 -- Remove the python2 subpackage - https://bugzilla.redhat.com/show_bug.cgi?id=1595193 +* Fri Jul 13 2018 Fedora Release Engineering - 4.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Mon Jun 25 2018 Petr Viktorin - 4.5.1-2 -- Allow Python 2 for build - see https://hurl.corp.redhat.com/rhel8-py2 +* Thu Jun 14 2018 Miro Hrončok - 4.5.1-2 +- Rebuilt for Python 3.7 * Mon Feb 12 2018 Tom Callaway - 4.5.1-1 - update to 4.5.1