Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-pip.git#f444f50981d3bc795d5ca0481a67e5ca41f56a67

python-pip.spec

@@ -1,6 +1,16 @@
+# The original RHEL 9 content set is defined by (build)dependencies
+# of the packages in Fedora ELN. Hence we disable tests and documentation here
+# to prevent pulling many unwanted packages in.
+# Once the RHEL 9 content set is defined and/or RHEL 9 forks from ELN,
+# the conditional can be removed from the Fedora spec file.
+# We intentionally keep this enabled on EPEL.
+%if 0%{?rhel} >= 9 && !0%{?epel}
+%bcond_with tests
+%bcond_with doc
+%else
 %bcond_without tests
-
 %bcond_without doc
+%endif
 
 %global srcname pip
 %global base_version 20.2.4
@@ -16,10 +26,8 @@
 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
 
 Name:           python-%{srcname}
-# When updating, update the bundled libraries versions bellow!
-# You can use vendor_meta.sh in the dist git repo
 Version:        %{base_version}%{?prerel:~%{prerel}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for installing and managing Python packages
 
 # We bundle a lot of libraries with pip, which itself is under MIT license.
@@ -58,6 +66,7 @@ BuildArch:      noarch
 
 %if %{with tests}
 BuildRequires:  /usr/bin/git
+BuildRequires:  /usr/bin/hg
 BuildRequires:  /usr/bin/bzr
 BuildRequires:  /usr/bin/svn
 BuildRequires:  python-setuptools-wheel
@@ -183,6 +192,7 @@ BuildRequires:  python3-rpm-generators >= 11-8
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  bash-completion
 %if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-cryptography
 BuildRequires:  python%{python3_pkgversion}-mock
 BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-pretend
@@ -401,6 +411,9 @@ pytest_k='not completion and
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Fri Dec 04 2020 Miro Hrončok <mhroncok@redhat.com> - 20.2.4-2
+- Disable tests and documentation in Fedora ELN (and RHEL)
+
 * Mon Oct 19 2020 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-1
 - Update to 20.2.4 (#1889112)
 

vendor_meta.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/bash -eu
-
-if [ $# -ne 1 ]; then
-  echo "Usage: ./vendor_meta.sh pip-10.0.0/src/pip/_vendor/vendor.txt"
-  exit 1
-fi
-
-licenses=''
-
-while read req; do
-  req=$(echo $req | cut -f1 -d' ')
-  name=$(echo $req | cut -f1 -d'=')
-  version=$(echo $req | cut -f3 -d'=' | tr -d '\r')
-  echo "Provides: bundled(python%{1}dist($name)) = $version"
-  license="$(pyp2rpm -v ${version} --no-venv ${name} | grep '^License:' | sed -e 's/License:\s*//')"
-  licenses="$licenses\n$name: $license"
-done < $1
-
-echo
-echo
-echo -e "$licenses"