From 5fab742fdc1e4c71ef1cdf7ecb06d04a70499d516dd9ed10ad547be1a1c213e6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 4 May 2023 12:50:47 +0000 Subject: [PATCH] Accepting request 1084683 from home:dirkmueller:acdc:as_python3_module - Testing must be single-spec as well. OBS-URL: https://build.opensuse.org/request/show/1084683 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=243 --- python-setuptools.changes | 5 +++++ python-setuptools.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 5a889c3..29e3a1c 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 4 12:50:17 UTC 2023 - Matej Cepl + +- Testing must be single-spec as well. + ------------------------------------------------------------------- Wed May 3 02:23:58 UTC 2023 - Steve Kowalik diff --git a/python-setuptools.spec b/python-setuptools.spec index 6636116..e1e5719 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -71,10 +71,10 @@ BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools = %{version}} +BuildRequires: %{python_module setuptools-wheel = %{version}} BuildRequires: %{python_module tomli-w >= 1.0.0} BuildRequires: %{python_module virtualenv >= 13.0.0} BuildRequires: %{python_module wheel} -BuildRequires: python3-setuptools-wheel = %{version} %endif %if 0%{?suse_version} || 0%{?fedora_version} >= 24 Recommends: ca-certificates-mozilla @@ -111,7 +111,7 @@ especially ones that have dependencies on other packages. %check %if %{with test} -export PRE_BUILT_SETUPTOOLS_WHEEL=%{python3_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl +%python_expand export PRE_BUILT_SETUPTOOLS_WHEEL=%{$python_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl export LANG=en_US.UTF-8 # tests need imports from local source dir export PYTHONPATH=$(pwd)