From 0b5fe3bc85150289fe80d0015756a1f69bf5e8bc4aae78278af4593b03799067 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 2 May 2013 09:11:59 +0000 Subject: [PATCH 1/4] Accepting request 173961 from home:dirkmueller:branches:devel:languages:python - update to 3.6: * Fix Nose support * Add --fail-under * Over 20 bug fixes, for details see included CHANGELOG - update to 3.6: * Fix Nose support * Add --fail-under * Over 20 bug fixes, for details see included CHANGELOG OBS-URL: https://build.opensuse.org/request/show/173961 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=22 --- coverage-3.5.3.tar.gz | 3 --- coverage-3.6.tar.gz | 3 +++ python-coverage.changes | 8 ++++++++ python-coverage.spec | 6 ++++-- python3-coverage.changes | 8 ++++++++ python3-coverage.spec | 4 ++-- 6 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 coverage-3.5.3.tar.gz create mode 100644 coverage-3.6.tar.gz diff --git a/coverage-3.5.3.tar.gz b/coverage-3.5.3.tar.gz deleted file mode 100644 index 3de5312..0000000 --- a/coverage-3.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60c6e95979d71175eb8acb7ca2def14c72794de418fd9222011f68283eb3cc02 -size 117909 diff --git a/coverage-3.6.tar.gz b/coverage-3.6.tar.gz new file mode 100644 index 0000000..539c3df --- /dev/null +++ b/coverage-3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df3bf169d4727f3fad146ca715a49a1f72a8258689651ef9de908022e739700d +size 232067 diff --git a/python-coverage.changes b/python-coverage.changes index 372a78e..69633c9 100644 --- a/python-coverage.changes +++ b/python-coverage.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com + +- update to 3.6: + * Fix Nose support + * Add --fail-under + * Over 20 bug fixes, for details see included CHANGELOG + ------------------------------------------------------------------- Tue Nov 20 18:15:53 UTC 2012 - saschpe@suse.de diff --git a/python-coverage.spec b/python-coverage.spec index a4854d8..6c03b6f 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -1,7 +1,7 @@ # # spec file for package python-coverage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-coverage -Version: 3.5.3 +Version: 3.6 Release: 0 Url: http://nedbatchelder.com/code/coverage/%{version} Summary: Code coverage measurement for Python @@ -52,6 +52,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %defattr(-,root,root,-) %doc AUTHORS.txt CHANGES.txt README.txt %{_bindir}/coverage +%{_bindir}/coverage2 +%{_bindir}/coverage-%{py_ver} %{python_sitearch}/coverage/ %{python_sitearch}/coverage-%{version}-py%{py_ver}.egg-info diff --git a/python3-coverage.changes b/python3-coverage.changes index a9f70e2..eb3af3a 100644 --- a/python3-coverage.changes +++ b/python3-coverage.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com + +- update to 3.6: + * Fix Nose support + * Add --fail-under + * Over 20 bug fixes, for details see included CHANGELOG + ------------------------------------------------------------------- Tue Nov 20 18:18:25 UTC 2012 - saschpe@suse.de diff --git a/python3-coverage.spec b/python3-coverage.spec index 2d5bcb9..ad04e9f 100644 --- a/python3-coverage.spec +++ b/python3-coverage.spec @@ -1,7 +1,7 @@ # # spec file for package python3-coverage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-coverage -Version: 3.5.3 +Version: 3.6 Release: 0 Url: http://nedbatchelder.com/code/coverage/%{version} Summary: Code coverage measurement for Python From 9ce3271a6d991214378c5d4de37cc0cd4f3a277b8f8831ebbfec9f9c992951b4 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 3 May 2013 09:14:06 +0000 Subject: [PATCH 2/4] - Apply update-alternatives for binaries and man-pages - Drop buildrequires on python-xml, I don't see it being used - Apply update-alternatives for binaries and man-pages - Drop buildrequires on python-xml, I don't see it being used OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=23 --- python-coverage.changes | 6 ++++++ python-coverage.spec | 26 ++++++++++++++++++++++++-- python3-coverage.changes | 6 ++++++ python3-coverage.spec | 19 +++++++++++++------ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/python-coverage.changes b/python-coverage.changes index 69633c9..eba323e 100644 --- a/python-coverage.changes +++ b/python-coverage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 3 09:15:27 UTC 2013 - speilicke@suse.com + +- Apply update-alternatives for binaries and man-pages +- Drop buildrequires on python-xml, I don't see it being used + ------------------------------------------------------------------- Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com diff --git a/python-coverage.spec b/python-coverage.spec index 6c03b6f..bf7cb10 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -27,9 +27,13 @@ Source: http://pypi.python.org/packages/source/c/coverage/coverage-%{ver BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -BuildRequires: python-xml +# Test requirements: +#BuildRequires: python-mock +#BuildRequires: python-nose Requires: python-distribute Requires: python-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif @@ -48,10 +52,28 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +#NOTE(saschpe): The following seems to mess with the install dir, which is odd: +#%%check +# Taken straight from tox.ini: +#python setup.py develop +#python igor.py zip_mods install_egg remove_extension +#python igor.py test_with_tracer py +#python setup.py --quiet build_ext --inplace +#python igor.py test_with_tracer c + +%post +update-alternatives \ + --install %{_bindir}/coverage coverage %{_bindir}/coverage-%{py_ver} 10 + +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove coverage %{_bindir}/coverage-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc AUTHORS.txt CHANGES.txt README.txt -%{_bindir}/coverage +%ghost %attr(0755,root,root) %{_bindir}/coverage %{_bindir}/coverage2 %{_bindir}/coverage-%{py_ver} %{python_sitearch}/coverage/ diff --git a/python3-coverage.changes b/python3-coverage.changes index eb3af3a..3203876 100644 --- a/python3-coverage.changes +++ b/python3-coverage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 3 09:16:06 UTC 2013 - speilicke@suse.com + +- Apply update-alternatives for binaries and man-pages +- Drop buildrequires on python-xml, I don't see it being used + ------------------------------------------------------------------- Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com diff --git a/python3-coverage.spec b/python3-coverage.spec index ad04e9f..8a58f48 100644 --- a/python3-coverage.spec +++ b/python3-coverage.spec @@ -25,13 +25,11 @@ License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python3 -BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute -BuildRequires: python3-xml Requires: python3-distribute -Requires: python3-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %description Coverage.py measures code coverage, typically during test execution. It uses @@ -40,18 +38,27 @@ library to determine which lines are executable, and which have been executed. %prep %setup -q -n coverage-%{version} -sed -i "s|coverage =|coverage-%{py3_ver} =|" setup.py # Add Python version suffix to binaries %build -2to3 --nobackups --write . python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +%post +update-alternatives \ + --install %{_bindir}/coverage coverage %{_bindir}/coverage-%{py3_ver} 10 + +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove coverage %{_bindir}/coverage-%{py3_ver} +fi + %files %defattr(-,root,root,-) %doc AUTHORS.txt CHANGES.txt README.txt +%ghost %attr(0755,root,root) %{_bindir}/coverage +%{_bindir}/coverage3 %{_bindir}/coverage-%{py3_ver} %{python3_sitearch}/coverage %{python3_sitearch}/coverage-%{version}-py%{py3_ver}.egg-info From 6aaf867aa497b0e285e5eb5fdbd392fba408da54666942defcbb1a3330ad7666 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 3 May 2013 10:02:59 +0000 Subject: [PATCH 3/4] - Update to version 1.3.3: + Upstreamed: - 0001-Restore-compatibility-with-Prettytable-0.7.2.patch - ignore-cmd2-requires.diff: OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=24 --- python3-coverage.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python3-coverage.spec b/python3-coverage.spec index 8a58f48..71a50fc 100644 --- a/python3-coverage.spec +++ b/python3-coverage.spec @@ -25,6 +25,7 @@ License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-distribute Requires: python3-distribute From f820e2ec3c133963e1e41b000d3cc684a5a99dae48fc160ee223b5abc5ca5693 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 3 May 2013 10:08:08 +0000 Subject: [PATCH 4/4] - Buildrequire python3 to get acces to the 'sha512' module (not part of python3-base which comes through python3-devel) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=25 --- python3-coverage.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python3-coverage.changes b/python3-coverage.changes index 3203876..9287573 100644 --- a/python3-coverage.changes +++ b/python3-coverage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 3 10:05:07 UTC 2013 - speilicke@suse.com + +- Buildrequire python3 to get acces to the 'sha512' module (not part + of python3-base which comes through python3-devel) + ------------------------------------------------------------------- Fri May 3 09:16:06 UTC 2013 - speilicke@suse.com