Accepting request 710332 from devel:languages:python

- Switch to mulitbuild to avoid dep on pytest by default
  (As pytest needs wheel to build itself)

- Reduce build requires and recommends to what is really needed
  (hint: almost nothing)

OBS-URL: https://build.opensuse.org/request/show/710332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-wheel?expand=0&rev=20

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>

python-wheel.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jun 17 10:35:46 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Switch to mulitbuild to avoid dep on pytest by default
+  (As pytest needs wheel to build itself)
+
+-------------------------------------------------------------------
+Fri Jun 14 08:59:02 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Reduce build requires and recommends to what is really needed
+  (hint: almost nothing)
+
 -------------------------------------------------------------------
 Wed May 15 20:46:24 UTC 2019 - Jonathan Harker <jharker@suse.com>
 

python-wheel.spec

@@ -17,7 +17,15 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-wheel
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-wheel%{psuffix}
 Version:        0.33.4
 Release:        0
 Summary:        A built-package format for Python
@@ -31,19 +39,11 @@ BuildRequires:  python-rpm-macros
 Requires:       python-setuptools
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Recommends:     python-dirspec
-Recommends:     python-ed25519ll
-Recommends:     python-keyring
-Recommends:     python-keyrings.alt
-Recommends:     python-pyxdg
 BuildArch:      noarch
-# SECTION test
-# Not compatible currently, see https://github.com/jaraco/keyrings.alt/issues/20
-#BuildRequires:  %%{python_module keyrings.alt}
-BuildRequires:  %{python_module keyring}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module pyxdg}
-# /SECTION
+%if %{with test}
+BuildRequires:  %{python_module pytest >= 3.0.0}
+BuildRequires:  %{python_module wheel >= %{version}}
+%endif
 %python_subpackages
 
 %description
@@ -57,39 +57,29 @@ step (simply extracting the file onto sys.path), and the unpacked archive
 preserves enough information to "Spread" (copy data and scripts to their
 final locations) at any later time.
 
-The wheel project provides a bdist_wheel command for setuptools
-(requires distribute >= 0.6.34). Wheel files can be
-installed with a newer pip from https://github.com/pypa/pip
-or with wheel's own command line utility.
-
-The wheel documentation is at http://wheel.rtfd.org/. The
-file format is documented in PEP 427
-(http://www.python.org/dev/peps/pep-0427/).
-
-The reference implementation is at http://bitbucket.org/dholth/wheel/
-
 %prep
 %setup -q -n wheel-%{version}
-# Remove addopts as it requires pytest-cov.  The reported coverage is not
-# nearly near 100%, and setup.cfg doesnt provide a minimum acceptable
-# coverage percentage, so coverage is not a metric which can be used
-# by automated QA to determine acceptance of the package.
+# Remove addopts as it requires pytest-cov
 sed -i '/addopts = /d' setup.cfg
 
 %build
 %python_build
 
 %install
+%if !%{with test}
 %python_install
 %python_clone -a %{buildroot}%{_bindir}/wheel
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
+%if %{with test}
 export LC_ALL=en_US.utf8
-%{python_expand rm -rf _build.python2 _build.python3
-PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version}
-rm -rf %{buildroot}%{$python_sitelib}/wheel/test/headers.dist}
+export PYTHONDONTWRITEBYTECODE=1
+%pytest
+%endif
 
+%if !%{with test}
 %post
 %python_install_alternative wheel
 
@@ -102,5 +92,6 @@ rm -rf %{buildroot}%{$python_sitelib}/wheel/test/headers.dist}
 %python_alternative %{_bindir}/wheel
 %{python_sitelib}/wheel-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/wheel/
+%endif
 
 %changelog