Replace pypi source with tarball from GitHub

Pypi source does not include tests folder so they had to be manually
downloaded from GitHub. This commit replaces pypi source with tarball
from GitHub where tests are included.
This also fixes rpmlint invalid-url warning.
This commit is contained in:
Tomas Hrnciar 2020-04-14 15:00:04 +02:00
parent 903b01b22d
commit f6c63603fb
2 changed files with 7 additions and 16 deletions

View File

@ -47,8 +47,8 @@ Summary: A tool for installing and managing Python packages
# webencodings: BSD # webencodings: BSD
License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
URL: http://www.pip-installer.org URL: https://pip.pypa.io/
Source0: %pypi_source Source0: https://github.com/pypa/pip/archive/%{version}/%{srcname}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
@ -60,16 +60,10 @@ BuildRequires: python-setuptools-wheel
BuildRequires: python-wheel-wheel BuildRequires: python-wheel-wheel
%endif %endif
# to get tests:
# git clone https://github.com/pypa/pip && cd pip
# VERSION= # define the version you want
# git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/
Source1: pip-%{version}-tests.tar.gz
# Themes required to build the docs. # Themes required to build the docs.
%if %{with doc} %if %{with doc}
Source2: https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_commit_hash}.tar.gz Source1: https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_commit_hash}.tar.gz
Source3: https://github.com/python/python-docs-theme/archive/2018.2.tar.gz Source2: https://github.com/python/python-docs-theme/archive/2018.2.tar.gz
%endif %endif
# Downstream only patch # Downstream only patch
@ -242,13 +236,12 @@ A Python wheel of pip to use with venv.
%prep %prep
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
tar -xf %{SOURCE1}
%if %{with doc} %if %{with doc}
pushd docs/html pushd docs/html
tar -xf %{SOURCE2} tar -xf %{SOURCE1}
mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa
tar -xf %{SOURCE3} tar -xf %{SOURCE2}
mv python-docs-theme-2018.2 python-docs-theme mv python-docs-theme-2018.2 python-docs-theme
popd popd
%endif %endif
@ -262,7 +255,6 @@ popd
# this goes together with patch4 # this goes together with patch4
rm src/pip/_vendor/certifi/*.pem rm src/pip/_vendor/certifi/*.pem
sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt
# tests expect wheels in here # tests expect wheels in here
ln -s %{python_wheeldir} tests/data/common_wheels ln -s %{python_wheeldir} tests/data/common_wheels

View File

@ -1,4 +1,3 @@
SHA512 (pip-20.0.2.tar.gz) = 72f9c4b8a5a3c5f8074bc2b671a118942f161fb145c38077ded8a18f07537eb674c679fdcf7c3f3f0aeee11d66fe34eaa157f53f1f689fce3e12567e5339ac89 SHA512 (pip-20.0.2.tar.gz) = f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
SHA512 (pip-20.0.2-tests.tar.gz) = ac6eb7c4814b61138741306661f050ed5232ed4e402978b0c05045bbbdc6cddf476340ba3438e4668716d9b3093932ef82d1e7a778c43ab5934ed003bace03cb
SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409 SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d