From a52524cd47e0209159db51d339b4c2938f37aa4a98de1c88a3818f5c1a01669d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 24 Jul 2018 06:41:54 +0000
Subject: [PATCH] Accepting request 624890 from
 home:mimi_vx:branches:devel:languages:python

- update to 18.0
- refresh pip-8.1.2-shipped-requests-cabundle.patch
 * drop python 3.3 support
 * Remove the legacy format from pip list.
 * Remove support for cleaning up #egg fragment postfixes
 * Remove the shim for the old get-pip.py location
 * Introduce a new --prefer-binary flag, to prefer older wheels
     over newer source packages.
 * Improve autocompletion function on file name completion
 * Add support for installing PEP 518 build dependencies from source
 * Improve status message when upgrade is skipped due to only-if-needed strategy

OBS-URL: https://build.opensuse.org/request/show/624890
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=54
---
 pip-10.0.1.tar.gz                         |  3 --
 pip-18.0.tar.gz                           |  3 ++
 pip-8.1.2-shipped-requests-cabundle.patch | 43 +++++++++++------------
 python-pip.changes                        | 15 ++++++++
 python-pip.spec                           |  2 +-
 5 files changed, 40 insertions(+), 26 deletions(-)
 delete mode 100644 pip-10.0.1.tar.gz
 create mode 100644 pip-18.0.tar.gz

diff --git a/pip-10.0.1.tar.gz b/pip-10.0.1.tar.gz
deleted file mode 100644
index 9c9e0d8..0000000
--- a/pip-10.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
-size 1246072
diff --git a/pip-18.0.tar.gz b/pip-18.0.tar.gz
new file mode 100644
index 0000000..63b9665
--- /dev/null
+++ b/pip-18.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76
+size 1249656
diff --git a/pip-8.1.2-shipped-requests-cabundle.patch b/pip-8.1.2-shipped-requests-cabundle.patch
index fa0b759..d8e48f3 100644
--- a/pip-8.1.2-shipped-requests-cabundle.patch
+++ b/pip-8.1.2-shipped-requests-cabundle.patch
@@ -1,24 +1,23 @@
-Index: pip-10.0.1/src/pip/_vendor/certifi/core.py
+Index: pip-18.0/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
+--- pip-18.0.orig/src/pip/_vendor/certifi/core.py
++++ pip-18.0/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(
+ 
+ This module returns the installation location of cacert.pem.
+ """
+-import os
+ import warnings
+ 
+ 
+@@ -19,9 +18,8 @@ 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():
diff --git a/python-pip.changes b/python-pip.changes
index 1def911..c89f0fb 100644
--- a/python-pip.changes
+++ b/python-pip.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jul 23 21:03:56 UTC 2018 - mimi.vx@gmail.com
+
+- update to 18.0
+- refresh pip-8.1.2-shipped-requests-cabundle.patch
+ * drop python 3.3 support
+ * Remove the legacy format from pip list.
+ * Remove support for cleaning up #egg fragment postfixes
+ * Remove the shim for the old get-pip.py location
+ * Introduce a new --prefer-binary flag, to prefer older wheels
+     over newer source packages.
+ * Improve autocompletion function on file name completion 
+ * Add support for installing PEP 518 build dependencies from source
+ * Improve status message when upgrade is skipped due to only-if-needed strategy
+
 -------------------------------------------------------------------
 Fri Apr 20 07:48:59 UTC 2018 - mimi.vx@gmail.com
 
diff --git a/python-pip.spec b/python-pip.spec
index 14eca28..13702ea 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -21,7 +21,7 @@
 # enable testing with a build conditional (off by default):
 %bcond_with test
 Name:           python-pip
-Version:        10.0.1
+Version:        18.0
 Release:        0
 Summary:        Pip installs packages. Python packages. An easy_install replacement
 License:        MIT