Hello community,
here is the log from the commit of package python-pip for openSUSE:Factory
checked in at 2020-11-25 19:27:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pip (Old)
and /work/SRC/openSUSE:Factory/.python-pip.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pip"
Wed Nov 25 19:27:44 2020 rev:51 rq:848968 version:20.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pip/python-pip.changes 2020-11-02
09:39:40.445568512 +0100
+++ /work/SRC/openSUSE:Factory/.python-pip.new.5913/python-pip.changes
2020-11-25 19:27:49.262374627 +0100
@@ -1,0 +2,15 @@
+Mon Nov 16 16:37:45 UTC 2020 - Matej Cepl <mc...@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 <mc...@suse.com>
+
+- Add wheel subpackage with the generated wheel for this package
+ (bsc#1176262, CVE-2019-20916).
+- Make wheel a separate build run to avoid the setuptools/wheel build
+ cycle.
+
+-------------------------------------------------------------------
Old:
----
setuptools-45.1.0-py3-none-any.whl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pip.spec ++++++
--- /var/tmp/diff_new_pack.A5Nv3e/_old 2020-11-25 19:27:49.806375312 +0100
+++ /var/tmp/diff_new_pack.A5Nv3e/_new 2020-11-25 19:27:49.810375317 +0100
@@ -21,9 +21,16 @@
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
+%bcond_with wheel
+%else
+%if "%{flavor}" == "wheel"
+%define psuffix -wheel
+%bcond_without wheel
%else
%define psuffix %{nil}
%bcond_with test
+%bcond_with wheel
+%endif
%endif
Name: python-pip%{psuffix}
Version: 20.2.3
@@ -33,9 +40,6 @@
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}
@@ -61,12 +65,16 @@
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
BuildRequires: git
BuildRequires: subversion
%endif
+%if %{with wheel}
+BuildRequires: %{python_module wheel}
+%endif
%python_subpackages
%description
@@ -83,7 +91,7 @@
%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
@@ -91,9 +99,13 @@
done
%build
+%if ! %{with wheel}
%python_build
+%else
+%python_exec setup.py bdist_wheel --universal
+%endif
-%if ! %{with test}
+%if !%{with test} && !%{with wheel}
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/pip
@@ -103,6 +115,10 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
+%if %{with wheel}
+%python_expand install -D -m 0644 -t %{buildroot}%{$python_sitelib}/../wheels
dist/*.whl
+%endif
+
%if %{with test}
%check
export PYTHONPATH=$(pwd)/build/lib
@@ -126,6 +142,7 @@
[ -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
@@ -137,9 +154,10 @@
%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
@@ -153,4 +171,9 @@
%{python_sitelib}/pip
%endif
+%if %{with wheel}
+%dir %{python_sitelib}/../wheels
+%{python_sitelib}/../wheels/*
+%endif
+
%changelog
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.A5Nv3e/_old 2020-11-25 19:27:49.838375352 +0100
+++ /var/tmp/diff_new_pack.A5Nv3e/_new 2020-11-25 19:27:49.838375352 +0100
@@ -1,3 +1,4 @@
<multibuild>
<package>test</package>
+ <package>wheel</package>
</multibuild>
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
