Compare commits

...

No commits in common. "c8s" and "c8-stream-2.7" have entirely different histories.

7 changed files with 64 additions and 132 deletions

View File

@ -1 +0,0 @@
1

37
.gitignore vendored
View File

@ -1,36 +1 @@
coverage-3.3.1.tar.gz SOURCES/coverage-4.5.1.tar.gz
coverage-3.4.tar.gz
/coverage-3.5b1.tar.gz
/coverage-3.5.1b1.tar.gz
/coverage-3.5.2b1.tar.gz
/coverage-3.5.3.tar.gz
/coverage-3.6b1.tar.gz
/coverage-3.6b3.tar.gz
/coverage-3.6.tar.gz
/coverage-3.7.tar.gz
/coverage-3.7.1.tar.gz
/coverage-4.0a1.tar.gz
/coverage-4.0a2.tar.gz
/coverage-4.0a3.tar.gz
/coverage-4.0a5.tar.gz
/coverage-4.0a6.tar.gz
/coverage-4.0b1.tar.gz
/coverage-4.0b2.tar.gz
/coverage-4.0b3.tar.gz
/coverage-4.0.tar.gz
/coverage-4.0.1.tar.gz
/coverage-4.0.2.tar.gz
/coverage-4.0.3.tar.gz
/coverage-4.1b1.tar.gz
/coverage-4.1b2.tar.gz
/coverage-4.1b3.tar.gz
/coverage-4.1.tar.gz
/coverage-4.2b1.tar.gz
/coverage-4.2.tar.gz
/coverage-4.3.1.tar.gz
/coverage-4.3.3.tar.gz
/coverage-4.4.tar.gz
/coverage-4.4.1.tar.gz
/coverage-4.4.2.tar.gz
/coverage-4.5.tar.gz
/coverage-4.5.1.tar.gz

View File

@ -0,0 +1 @@
ec7c2ee6eae78708bee08af8b85e03dd8d673ef2 SOURCES/coverage-4.5.1.tar.gz

View File

@ -1,9 +1,10 @@
# %%global prever b1 # %%global prever b1
%bcond_without python3
Name: python-coverage Name: python-coverage
Summary: Code coverage testing module for Python Summary: Code coverage testing module for Python
Version: 4.5.1 Version: 4.5.1
Release: 9%{?prever}%{?dist} Release: 4%{?prever}%{?dist}
# jquery(MIT): # jquery(MIT):
# coverage/htmlfiles/jquery.min.js # coverage/htmlfiles/jquery.min.js
# MIT or GPL: # MIT or GPL:
@ -22,51 +23,48 @@ execution. It uses the code analysis tools and tracing hooks provided in the
Python standard library to determine which lines are executable, and which Python standard library to determine which lines are executable, and which
have been executed. have been executed.
%package -n platform-python-coverage %package -n python2-coverage
Summary: Code coverage testing module for Python 3 Summary: Code coverage testing module for Python 2
BuildRequires: python3-devel BuildRequires: python2-devel
BuildRequires: python3-setuptools BuildRequires: python2-setuptools
# As the "coverage" executable requires the setuptools at runtime (#556290), # As the "coverage" executable requires the setuptools at runtime (#556290),
# so the "python3-coverage" executable requires python3-setuptools: # so the "python3-coverage" executable requires python3-setuptools:
%if 0%{?rhel} && 0%{?rhel} >= 8 Requires: python2-setuptools
Requires: platform-python-setuptools %{?python_provide:%python_provide python2-coverage}
%else
Requires: python3-setuptools
%endif
Provides: bundled(js-jquery) = 1.11.1 Provides: bundled(js-jquery) = 1.11.1
Provides: bundled(js-jquery-debounce) = 1.1 Provides: bundled(js-jquery-debounce) = 1.1
Provides: bundled(js-jquery-hotkeys) = 0.8 Provides: bundled(js-jquery-hotkeys) = 0.8
Provides: bundled(js-jquery-isonscreen) = 1.2.0 Provides: bundled(js-jquery-isonscreen) = 1.2.0
Provides: bundled(js-jquery-tablesorter) Provides: bundled(js-jquery-tablesorter)
Conflicts: python3-coverage < 4.5.1-7%{?dist} %description -n python2-coverage
Coverage.py is a Python 2 module that measures code coverage during Python
%description -n platform-python-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 execution. It uses the code analysis tools and tracing hooks provided in the
Python standard library to determine which lines are executable, and which Python standard library to determine which lines are executable, and which
have been executed. have been executed.
%if %{with python3}
%package -n python3-coverage %package -n python3-coverage
Summary: Code coverage testing module for Python 3 Summary: Code coverage testing module for Python 3
Requires: platform-python-coverage = %{version}-%{release} BuildRequires: python3-devel
BuildRequires: python3-setuptools
# Require alternatives version that implements the --keep-foreign flag # As the "coverage" executable requires the setuptools at runtime (#556290),
Requires(postun): alternatives >= 1.19.1-1 # so the "python3-coverage" executable requires python3-setuptools:
# For alternatives Requires: python3-setuptools
Requires: python36
Requires(post): python36
Requires(postun): python36
%{?python_provide:%python_provide python3-coverage} %{?python_provide:%python_provide python3-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)
Obsoletes: platform-python-coverage < %{version}-%{release}
%description -n python3-coverage %description -n python3-coverage
Coverage.py is a Python 3 module that measures code coverage during Python 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 execution. It uses the code analysis tools and tracing hooks provided in the
Python standard library to determine which lines are executable, and which Python standard library to determine which lines are executable, and which
have been executed. have been executed.
%endif
%prep %prep
%setup -q -n coverage-%{version}%{?prever} %setup -q -n coverage-%{version}%{?prever}
@ -76,81 +74,65 @@ sed -i 's/\r//g' README.rst
%build %build
%py2_build
%if %{with python3}
%py3_build %py3_build
%endif
%install %install
%if %{with python3}
%py3_install %py3_install
mv %{buildroot}/%{_bindir}/coverage %{buildroot}/%{_bindir}/python3-coverage
%endif
%py2_install
# rename binaries, make compat symlinks # rename binaries, make compat symlinks
pushd %{buildroot}%{_bindir} 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 rm coverage2
# section check to succeed mv coverage{,-%{python2_version}}
touch coverage-3 ln -s coverage-{%{python2_version},2}
%if %{with python3}
rm -rf coverage-3* coverage3
for i in coverage3 coverage-%{python3_version}; do
ln -s python3-coverage $i
done
%endif
popd popd
%files -n python2-coverage
%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
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc README.rst %doc README.rst
%{python3_sitearch}/coverage/ %{_bindir}/coverage-2
%{python3_sitearch}/coverage*.egg-info/ %{_bindir}/coverage-%{python2_version}
%{python2_sitearch}/coverage/
%{python2_sitearch}/coverage*.egg-info/
%if %{with python3}
%files -n python3-coverage %files -n python3-coverage
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc README.rst %doc README.rst
%{_bindir}/coverage-%{python3_version} %{_bindir}/coverage-3*
%ghost %{_bindir}/coverage-3 %{_bindir}/coverage3
%{_bindir}/python3-coverage
%{python3_sitearch}/coverage/
%{python3_sitearch}/coverage*.egg-info/
%endif
%changelog %changelog
* Mon Aug 23 2021 Tomas Orsava <torsava@redhat.com> - 4.5.1-9 * Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 4.5.1-4
- Bump release to rebuild - Bumping due to problems with modular RPM upgrade path
- Resolves: rhbz#1695587
* Fri Jul 30 2021 Tomas Orsava <torsava@redhat.com> - 4.5.1-8 * Wed Aug 08 2018 Lumír Balhar <lbalhar@redhat.com> - 4.5.1-3
- Adjusted the postun scriptlets to enable upgrading to RHEL 9 - Remove unversioned binaries from python2 subpackage
- Resolves: rhbz#1933055 - Resolves: rhbz#1613343
* Wed Dec 12 2018 Tomas Orsava <torsava@redhat.com> - 4.5.1-7 * Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 4.5.1-2
- New subpackage platform-python-coverage without files from /usr/bin/* - Make possible to disable python3 subpackage
- python3-coverage contains only files from /usr/bin/* and depends
on platform-python-coverage
- Resolves: rhbz#1658674
* Fri Nov 16 2018 Lumír Balhar <lbalhar@redhat.com> - 4.5.1-6
- Require platform-python-setuptools instead of python3-setuptools
- Resolves: rhbz#1650532
* Tue Sep 25 2018 Lumír Balhar <lbalhar@redhat.com> - 4.5.1-5
- Add alternatives for coverage-3 -> coverage-3.6
- Resolves: rhbz#1633547
* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 4.5.1-4
- Remove unversioned executables (only *-3.6 should be provided)
* Mon Jul 09 2018 Petr Viktorin <pviktori@redhat.com> - 4.5.1-3
- Remove the python2 subpackage
https://bugzilla.redhat.com/show_bug.cgi?id=1595193
* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 4.5.1-2
- Allow Python 2 for build
see https://hurl.corp.redhat.com/rhel8-py2
* Mon Feb 12 2018 Tom Callaway <spot@fedoraproject.org> - 4.5.1-1 * Mon Feb 12 2018 Tom Callaway <spot@fedoraproject.org> - 4.5.1-1
- update to 4.5.1 - update to 4.5.1

7
ci.fmf
View File

@ -1,7 +0,0 @@
execute:
script: coverage-3.6 --help
prepare:
- name: packages
how: install
package:
- python3-coverage

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1 +0,0 @@
SHA512 (coverage-4.5.1.tar.gz) = 82742a572549400778cad99057b1ced4c36b61e917983148eccc86bfa6340de8cfefc4f743e79ff876b641e0b9d21307dd6bde78638a6b20dd8ad215068dda25