rpms/python-pip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Make patches apply --without tests

Browse Source 
Some patches touch tests and we didn't include the test sources --without tests,
leading to broken build. This was a long standing reoccurring problem.

Now we always include and unpack tests sources, even when we don't run them.
This commit is contained in:
Miro Hrončok 2020-04-06 13:24:41 +02:00
parent eb1cbbd764
commit 7913cd9edf
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python-pip.spec
View File

@ -64,9 +64,7 @@ BuildRequires: python-wheel-wheel
# git clone https://github.com/pypa/pip && cd pip # git clone https://github.com/pypa/pip && cd pip
# VERSION= # define the version you want # VERSION= # define the version you want
# git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/ # git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/
%if %{with tests}
Source1: pip-%{version}-tests.tar.gz Source1: pip-%{version}-tests.tar.gz
%endif
# Themes required to build the docs. # Themes required to build the docs.
%if %{with doc} %if %{with doc}
@ -239,9 +237,8 @@ A Python wheel of pip to use with venv.
%prep %prep
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
%if %{with tests}
tar -xf %{SOURCE1} tar -xf %{SOURCE1}
%endif
%if %{with doc} %if %{with doc}
pushd docs/html pushd docs/html
tar -xf %{SOURCE2} tar -xf %{SOURCE2}
@ -261,10 +258,8 @@ popd
rm src/pip/_vendor/certifi/*.pem rm src/pip/_vendor/certifi/*.pem
sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt
%if %{with tests}
# 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
%endif
%build %build