From ec091103ecc9da8c903ad7cb882e4538b2f8a4fb08db994e1393dab793e0d363 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 16 Nov 2020 16:40:46 +0000
Subject: [PATCH] - Actually, test the new structure of package. :$ - Remove
 the additional sourced setuptools*.whl and use BR on  
 python-setuptools-wheel.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=86
---
 python-pip.changes                 |  7 +++++++
 python-pip.spec                    | 24 +++++++-----------------
 setuptools-45.1.0-py3-none-any.whl |  3 ---
 3 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 setuptools-45.1.0-py3-none-any.whl

diff --git a/python-pip.changes b/python-pip.changes
index cf694f9..33efb6c 100644
--- a/python-pip.changes
+++ b/python-pip.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 16 16:37:45 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Actually, test the new structure of package. :$
+- Remove the additional sourced setuptools*.whl and use BR on
+  python-setuptools-wheel.
+
 -------------------------------------------------------------------
 Fri Nov 13 18:51:09 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-pip.spec b/python-pip.spec
index b54ac37..22c6730 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -29,7 +29,7 @@
 %else
 %define psuffix %{nil}
 %bcond_with test
-%bcond_without wheel
+%bcond_with wheel
 %endif
 %endif
 Name:           python-pip%{psuffix}
@@ -40,9 +40,6 @@ License:        MIT
 URL:            http://www.pip-installer.org
 # The PyPI archive lacks the tests
 Source:         https://github.com/pypa/pip/archive/%{version}.tar.gz#/pip-%{version}-gh.tar.gz
-# Wheel used for testing, no need to update regularly beyond the minimum version specified in 
-# tools/requirements/tests-common_wheels.txt
-Source1:        https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-45.1.0-py3-none-any.whl
 # PATCH-FIX-OPENSUSE pip-shipped-requests-cabundle.patch -- adapted patch from python-certifi package
 Patch0:         pip-shipped-requests-cabundle.patch
 BuildRequires:  %{python_module setuptools >= 40.8.0}
@@ -68,6 +65,7 @@ BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module scripttest}
+BuildRequires:  %{python_module setuptools-wheel}
 BuildRequires:  %{python_module virtualenv >= 1.10}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  ca-certificates
@@ -84,15 +82,6 @@ Pip is a replacement for easy_install. It uses mostly the same techniques for
 finding packages, so packages that were made easy_installable should be
 pip-installable as well.
 
-%if %{with wheel}
-%package wheel
-Summary:        Wheels for %{name}
-BuildArch:      noarch
-
-%description wheel
-Generated wheels for %{name}.
-%endif
-
 %prep
 %setup -q -n pip-%{version}
 # Unbundling is not advised by upstream. See src/pip/_vendor/README.rst
@@ -102,7 +91,7 @@ rm src/pip/_vendor/certifi/cacert.pem
 
 %if %{with test}
 mkdir -p tests/data/common_wheels
-cp %{SOURCE1} tests/data/common_wheels/
+%python_expand cp %{$python_sitelib}/../wheels/setuptools*.whl tests/data/common_wheels/
 %endif
 # remove shebangs verbosely (if only sed would offer a verbose mode...)
 for f in $(find src -name \*.py -exec grep -l '^#!%{_bindir}/env' {} \;); do
@@ -130,7 +119,7 @@ rm -f %{buildroot}%{_bindir}/pip3-2*
 %python_expand install -D -m 0644 -t %{buildroot}%{$python_sitelib}/../wheels dist/*.whl
 %endif
 
-%if !%{with test} && !%{with wheel}
+%if %{with test}
 %check
 export PYTHONPATH=$(pwd)/build/lib
 # no network on OBS
@@ -153,6 +142,7 @@ donttest+=" or test_from_link_vcs_without_source_dir"
 [ -h %{_bindir}/pip ] || rm -f %{_bindir}/pip
 [ -h %{_bindir}/pip3 ] || rm -f %{_bindir}/pip3
 
+%if !%{with test} && !%{with wheel}
 %post
 # keep the alternative groups separate. Users could decide to let pip and pip3 point to
 # different flavors
@@ -164,9 +154,10 @@ donttest+=" or test_from_link_vcs_without_source_dir"
 %postun
 %python_uninstall_alternative pip
 %python_uninstall_alternative pip3
+%endif
 
-%if ! %{with test}
 %files %{python_files}
+%if !%{with test} && !%{with wheel}
 %license LICENSE.txt
 %doc AUTHORS.txt NEWS.rst README.rst
 %python_alternative %{_bindir}/pip
@@ -181,7 +172,6 @@ donttest+=" or test_from_link_vcs_without_source_dir"
 %endif
 
 %if %{with wheel}
-%files %{python_files wheel}
 %dir %{python_sitelib}/../wheels
 %{python_sitelib}/../wheels/*
 %endif
diff --git a/setuptools-45.1.0-py3-none-any.whl b/setuptools-45.1.0-py3-none-any.whl
deleted file mode 100644
index 9fe7f24..0000000
--- a/setuptools-45.1.0-py3-none-any.whl
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68e7fd3508687f94367f1aa090a3ed921cd045a60b73d8b0aa1f305199a0ca28
-size 583923