Hello community, here is the log from the commit of package python-six for openSUSE:Factory checked in at 2017-02-27 18:28:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-six (Old) and /work/SRC/openSUSE:Factory/.python-six.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-six" Changes: -------- --- /work/SRC/openSUSE:Factory/python-six/python-six-doc.changes 2016-01-23 01:04:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-six.new/python-six-doc.changes 2017-02-27 18:28:31.705430166 +0100 @@ -1,0 +2,7 @@ +Thu Feb 23 14:47:06 UTC 2017 - jmatejek@suse.com + +- update for singlespec +- only use python3 version of Sphinx to build docs +- provide $flavor-doc for all pythons + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-six/python-six.changes 2016-02-23 16:53:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-six.new/python-six.changes 2017-02-27 18:28:31.765421713 +0100 @@ -1,0 +2,5 @@ +Wed Oct 5 14:33:14 UTC 2016 - jmatejek@suse.com + +- update for multipython build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-six-doc.spec ++++++ --- /var/tmp/diff_new_pack.TO1u1H/_old 2017-02-27 18:28:32.153367053 +0100 +++ /var/tmp/diff_new_pack.TO1u1H/_new 2017-02-27 18:28:32.153367053 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-six-doc # -# 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,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six-doc Version: 1.10.0 Release: 0 @@ -25,13 +26,17 @@ Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-six -# Documentation requirements: -BuildRequires: python-Sphinx +BuildRequires: %{python_module six} +# require old python 2 explicitly to get the ssl module +BuildRequires: python +# require only one version of Sphinx for now +BuildRequires: python3-Sphinx # Test requirements: -BuildRequires: python-py -BuildRequires: python-pytest +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module py} +BuildRequires: python-rpm-macros BuildArch: noarch +Provides: %{python_module six-doc = %{version}} %description Six is a Python 2 and 3 compatibility library. It provides utility @@ -56,7 +61,7 @@ mkdir test cp test_six.py test pushd test -py.test test_six.py +%python_exec %{_bindir}/py.test test_six.py popd rm -rf test ++++++ python-six.spec ++++++ --- /var/tmp/diff_new_pack.TO1u1H/_old 2017-02-27 18:28:32.177363671 +0100 +++ /var/tmp/diff_new_pack.TO1u1H/_new 2017-02-27 18:28:32.177363671 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-six # -# 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,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six Version: 1.10.0 Release: 0 @@ -25,16 +26,17 @@ Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel -%if 0%{?suse_version} <= 1110 -BuildRequires: python-argparse -Requires: python-argparse -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif +BuildRequires: %{python_module base} +BuildRequires: python-rpm-macros %if 0%{?suse_version} > 1110 BuildArch: noarch +%else +BuildRequires: python-argparse +Requires: python-argparse %endif +%python_subpackages + %description Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python @@ -46,28 +48,22 @@ %setup -q -n six-%{version} %build -python setup.py build +%python_build # due to cyclic requirements between Sphinx and six, # documentation is build in its own package <hpj@urpla.net> %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install # Run tests in -doc package to avoid dependency loop # %check # python test_six.py -%pre -# previous versions of the package installed .egg-info as a directory, -# the new update now installs it as a file. Clean out the directory, should it exist. -if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info ]; then - rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info -fi - -%files +%files %python_files %defattr(-,root,root) %doc LICENSE README %{python_sitelib}/six.py* +%pycache_only %{python3_sitelib}/__pycache__/* %{python_sitelib}/six-%{version}-py*.egg-info %changelog