diff --git a/pip-10.0.1.tar.gz b/pip-10.0.1.tar.gz new file mode 100644 index 0000000..9c9e0d8 --- /dev/null +++ b/pip-10.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68 +size 1246072 diff --git a/pip-8.1.2-shipped-requests-cabundle.patch b/pip-8.1.2-shipped-requests-cabundle.patch index 31de86d..fa0b759 100644 --- a/pip-8.1.2-shipped-requests-cabundle.patch +++ b/pip-8.1.2-shipped-requests-cabundle.patch @@ -1,13 +1,24 @@ -diff -ruN a/pip/_vendor/requests/certs.py b/pip/_vendor/requests/certs.py ---- a/pip/_vendor/requests/certs.py 2014-05-16 20:03:31.000000000 +0200 -+++ b/pip/_vendor/requests/certs.py 2014-07-03 09:54:46.751966582 +0200 -@@ -19,8 +19,7 @@ - except ImportError: - def where(): - """Return the preferred certificate bundle.""" -- # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return "/etc/ssl/ca-bundle.pem" - - if __name__ == '__main__': - print(where()) +Index: pip-10.0.1/src/pip/_vendor/certifi/core.py +=================================================================== +--- pip-10.0.1.orig/src/pip/_vendor/certifi/core.py ++++ pip-10.0.1/src/pip/_vendor/certifi/core.py +@@ -7,7 +7,6 @@ certifi.py + + This module returns the installation location of cacert.pem. + """ +-import os + import warnings + + +@@ -19,10 +18,7 @@ class DeprecatedBundleWarning(Deprecatio + + + def where(): +- f = os.path.dirname(__file__) +- +- return os.path.join(f, 'cacert.pem') +- ++ return '/etc/ssl/ca-bundle.pem' + + def old_where(): + warnings.warn( diff --git a/pip-9.0.1.tar.gz b/pip-9.0.1.tar.gz deleted file mode 100644 index 7aaaf66..0000000 --- a/pip-9.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d -size 1197370 diff --git a/python-pip.changes b/python-pip.changes index cc0f6bb..3921900 100644 --- a/python-pip.changes +++ b/python-pip.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 20 07:48:59 UTC 2018 - mimi.vx@gmail.com + +- update to 10.0.1 +- refactor pip-8.1.2-shipped-requests-cabundle.patch + * Switch the default repository to the new "PyPI 2.0" running at https://pypi.org/ + * big bunch of changes from 9.0.1 in NEWS.rst + + ------------------------------------------------------------------- Wed Mar 29 13:52:06 UTC 2017 - jmatejek@suse.com diff --git a/python-pip.spec b/python-pip.spec index b370b35..1aef44d 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,7 +1,7 @@ # # spec file for package python-pip # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pip -Version: 9.0.1 +Version: 10.0.1 Release: 0 Url: http://www.pip-installer.org Summary: Pip installs packages. Python packages. An easy_install replacement @@ -37,7 +37,9 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with test} # Test requirements: +BuildRequires: %{python_module freezegun} BuildRequires: %{python_module mock} +BuildRequires: %{python_module pretend} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scripttest >= 1.3} BuildRequires: %{python_module virtualenv >= 1.10} @@ -62,10 +64,10 @@ pip-installable as well. %prep %setup -q -n pip-%{version} %patch0 -p1 -find pip/_vendor -name *.py -exec \ +find src/pip/_vendor -name *.py -exec \ sed -i "s|#!/usr/bin/env python||g" {} ";" # Fix non-executable script #sed -i "s|#!/usr/bin/env python||g" pip/__init__.py # Fix non-executable script -rm pip/_vendor/requests/cacert.pem +rm src/pip/_vendor/certifi/cacert.pem %build %python_build @@ -103,7 +105,7 @@ PRIO=$(echo %{python_version} | tr -d .) %files %{python_files} %defattr(-,root,root,-) -%doc AUTHORS.txt CHANGES.txt LICENSE.txt README.rst +%doc AUTHORS.txt NEWS.rst LICENSE.txt README.rst %{_bindir}/pip %python2_only %{_bindir}/pip2 %python3_only %{_bindir}/pip3