commit python-python-subunit for openSUSE:Factory
Hello community, here is the log from the commit of package python-python-subunit for openSUSE:Factory checked in at 2017-05-06 18:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-python-subunit (Old) and /work/SRC/openSUSE:Factory/.python-python-subunit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-python-subunit" Sat May 6 18:27:31 2017 rev:16 rq:490140 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-python-subunit/python-python-subunit.changes 2016-09-28 15:04:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-python-subunit.new/python-python-subunit.changes 2017-05-06 18:27:39.312128199 +0200 @@ -1,0 +2,10 @@ +Sun Apr 23 16:58:19 UTC 2017 - aloisio@gmx.com + +- Added fixtures build requirement + +------------------------------------------------------------------- +Fri Apr 7 13:22:48 UTC 2017 - aloisio@gmx.com + +- Converted to single-spec (with great help from Jan Matejek) + +------------------------------------------------------------------- New: ---- python-python-subunit-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-python-subunit.spec ++++++ --- /var/tmp/diff_new_pack.i4g3j5/_old 2017-05-06 18:27:41.307846593 +0200 +++ /var/tmp/diff_new_pack.i4g3j5/_new 2017-05-06 18:27:41.311846028 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-python-subunit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,30 +16,30 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-python-subunit Version: 1.2.0 Release: 0 Summary: Python implementation of subunit test streaming protocol License: Apache-2.0 or BSD-3-Clause Group: Development/Languages/Python -Url: http://launchpad.net/subunit -Source: http://pypi.python.org/packages/source/p/python-subunit/python-subunit-%{version}.tar.gz +Url: https://launchpad.net/subunit +Source: https://files.pythonhosted.org/packages/source/p/python-subunit/python-subunit-%{version}.tar.gz +Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE speilicke@suse.com -- Filters are installed in /usr/bin. Patch0: python-subunit-filter-path.patch -BuildRequires: python-devel +BuildRequires: %{python_module devel} +BuildRequires: %{python_module fixtures} # Test requriements -BuildRequires: python-testscenarios -BuildRequires: python-testtools >= 0.9.34 +BuildRequires: %{python_module testscenarios} +BuildRequires: %{python_module testtools >= 0.9.34} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-extras Requires: python-testtools >= 0.9.34 -Requires(post): update-alternatives -Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description Subunit is a streaming protocol for test results. The protocol is human @@ -53,99 +53,43 @@ %prep %setup -q -n python-subunit-%{version} %patch0 -p1 -for B in subunit2csv subunit-2to1 subunit-1to2 subunit-filter subunit-ls subunit-notify subunit-stats subunit-tags subunit-output subunit2gtk subunit2junitxml subunit2pyunit tap2subunit ; do - sed -i "s|'filters/$B'|'filters/$B-%{py_ver}'|" setup.py - mv filters/$B filters/$B-%{py_ver} -done -sed -i "s|'subunit-filter'|'subunit-filter-%{py_ver}'|" python/subunit/tests/test_subunit_filter.py +# Remove shebang from non-executable files +sed -i -e "1d" python/subunit/run.py %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install #NOTE(saschpe): The testsuite demands executables: -chmod +x %{buildroot}%{python_sitelib}/subunit/tests/sample-*.py -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -for B in subunit2csv subunit-2to1 subunit-1to2 subunit-filter subunit-ls subunit-notify subunit-stats subunit-tags subunit-output subunit2gtk subunit2junitxml subunit2pyunit tap2subunit ; do - touch %{buildroot}%{_sysconfdir}/alternatives/$B - ln -sf %{_sysconfdir}/alternatives/$B %{buildroot}/%{_bindir}/$B -done +%{python_expand chmod +x %{buildroot}%{$python_sitelib}/subunit/tests/sample-*.py + %fdupes -s %{buildroot}%{$python_sitelib} +} %check -#NOTE(saschpe): Pesky testsuite doesn't know about buildroot -sed -i "s|'/',|'%{buildroot}',|" %{buildroot}%{python_sitelib}/subunit/tests/test_subunit_filter.py -PYTHONPATH=%{buildroot}%{python_sitelib} python -m testtools.run subunit.test_suite -sed -i "s|'%{buildroot}',|'/',|" %{buildroot}%{python_sitelib}/subunit/tests/test_subunit_filter.py -# Fixup compiled python module afterwards: -%if 0%{?suse_version} -%py_compile %{buildroot}%{python_sitelib}/subunit/tests -%endif +patch -p1 -R < %{PATCH0} +export PYTHONPATH="$PWD/python" +%python_exec -m testtools.run subunit.test_suite -%post -update-alternatives \ - --install %{_bindir}/subunit-2to1 subunit-2to1 %{_bindir}/subunit-2to1-%{py_ver} 20 \ - --slave %{_bindir}/subunit-1to2 subunit-1to2 %{_bindir}/subunit-1to2-%{py_ver} \ - --slave %{_bindir}/subunit2csv subunit2csv %{_bindir}/subunit2csv-%{py_ver} \ - --slave %{_bindir}/subunit-filter subunit-filter %{_bindir}/subunit-filter-%{py_ver} \ - --slave %{_bindir}/subunit-ls subunit-ls %{_bindir}/subunit-ls-%{py_ver} \ - --slave %{_bindir}/subunit-notify subunit-notify %{_bindir}/subunit-notify-%{py_ver} \ - --slave %{_bindir}/subunit-stats subunit-stats %{_bindir}/subunit-stats-%{py_ver} \ - --slave %{_bindir}/subunit-tags subunit-tags %{_bindir}/subunit-tags-%{py_ver} \ - --slave %{_bindir}/subunit-output subunit-output %{_bindir}/subunit-output-%{py_ver} \ - --slave %{_bindir}/subunit2gtk subunit2gtk %{_bindir}/subunit2gtk-%{py_ver} \ - --slave %{_bindir}/subunit2junitxml subunit2junitxml %{_bindir}/subunit2junitxml-%{py_ver} \ - --slave %{_bindir}/subunit2pyunit subunit2pyunit %{_bindir}/subunit2pyunit-%{py_ver} \ - --slave %{_bindir}/tap2subunit tap2subunit %{_bindir}/tap2subunit-%{py_ver} - -%postun -if [ $1 -eq 0 ] ; then - update-alternatives --remove subunit %{_bindir}/subunit-%{py_ver} -fi - -%files +%files %{python_files} %defattr(-,root,root,-) %doc README.rst NEWS +%ifpython3 %{_bindir}/subunit2csv -%{_bindir}/subunit2csv-%{py_ver} %{_bindir}/subunit-2to1 -%{_bindir}/subunit-2to1-%{py_ver} %{_bindir}/subunit-1to2 -%{_bindir}/subunit-1to2-%{py_ver} %{_bindir}/subunit-filter -%{_bindir}/subunit-filter-%{py_ver} %{_bindir}/subunit-ls -%{_bindir}/subunit-ls-%{py_ver} %{_bindir}/subunit-notify -%{_bindir}/subunit-notify-%{py_ver} %{_bindir}/subunit-stats -%{_bindir}/subunit-stats-%{py_ver} %{_bindir}/subunit-tags -%{_bindir}/subunit-tags-%{py_ver} %{_bindir}/subunit-output -%{_bindir}/subunit-output-%{py_ver} %{_bindir}/subunit2gtk -%{_bindir}/subunit2gtk-%{py_ver} %{_bindir}/subunit2junitxml -%{_bindir}/subunit2junitxml-%{py_ver} %{_bindir}/subunit2pyunit -%{_bindir}/subunit2pyunit-%{py_ver} %{_bindir}/tap2subunit -%{_bindir}/tap2subunit-%{py_ver} -%ghost %{_sysconfdir}/alternatives/subunit2csv -%ghost %{_sysconfdir}/alternatives/subunit-2to1 -%ghost %{_sysconfdir}/alternatives/subunit-1to2 -%ghost %{_sysconfdir}/alternatives/subunit-filter -%ghost %{_sysconfdir}/alternatives/subunit-ls -%ghost %{_sysconfdir}/alternatives/subunit-notify -%ghost %{_sysconfdir}/alternatives/subunit-stats -%ghost %{_sysconfdir}/alternatives/subunit-tags -%ghost %{_sysconfdir}/alternatives/subunit-output -%ghost %{_sysconfdir}/alternatives/subunit2gtk -%ghost %{_sysconfdir}/alternatives/subunit2junitxml -%ghost %{_sysconfdir}/alternatives/subunit2pyunit -%ghost %{_sysconfdir}/alternatives/tap2subunit +%endif %{python_sitelib}/subunit -%{python_sitelib}/python_subunit-%{version}-py%{py_ver}.egg-info +%{python_sitelib}/python_subunit-%{version}-py%{python_version}.egg-info %changelog ++++++ python-python-subunit-rpmlintrc ++++++ # this can't be helped addFilter("no-manual-page-for-binary .*subunit.*")
participants (1)
-
root@hilbert.suse.de