[Jython-checkins] jython: Upgrade bundled pip and setuptool

[jeff.allen]

https://hg.python.org/jython/rev/2d62972ea150
changeset:   8249:2d62972ea150
user:        James Mudd <james.mudd at gmail.com>
date:        Wed May 15 08:21:23 2019 +0100
summary:
  Upgrade bundled pip and setuptool
Update pip 9.0.1 to 19.1
Update setuptools 28.8.0 to 41.0.1

files:
  Lib/ensurepip/__init__.py                                     |    8 ++++----
  Lib/ensurepip/_bundled/pip-19.1-py2.py3-none-any.whl          |  Bin 
  Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-41.0.1-py2.py3-none-any.whl |  Bin 
  5 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,9 +12,9 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "28.8.0"
+_SETUPTOOLS_VERSION = "41.0.1"
 
-_PIP_VERSION = "9.0.1"
+_PIP_VERSION = "19.1"
 
 # pip currently requires ssl support, so we try to provide a nicer
 # error message when that is missing (http://bugs.python.org/issue19744)
@@ -42,8 +42,8 @@
         sys.path = additional_paths + sys.path
 
     # Install the bundled software
-    import pip
-    pip.main(args)
+    from pip._internal import main
+    main(args)
 
 
 def version():
diff --git a/Lib/ensurepip/_bundled/pip-19.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-19.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2d3ac5d984a2b68ddcc405f104f546a4c01042f6
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
deleted file mode 100644
index 4b8ecc69db7e37fc6dd7b6dd8f690508f42866a1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
deleted file mode 100644
index 502e3cb418c154872ad6e677ef8b63557b38ec35..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-41.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-41.0.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..92836e98402648041d1bc2ae34aaf882d1ebb00b
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/jython