[Jython-checkins] jython: Fix setuptools wheel bundled by ensurepip so it check for Windows on Jython

[jim.baker]

https://hg.python.org/jython/rev/cbb7baea2f3e
changeset:   7636:cbb7baea2f3e
user:        Jim Baker <jim.baker at rackspace.com>
date:        Wed Apr 01 13:27:35 2015 -0600
summary:
  Fix setuptools wheel bundled by ensurepip so it check for Windows on Jython

Now uses https://github.com/jythontools/setuptools, which changes the
check so it also accounts for os._name == "nt" to test if on
Windows. This fork is temporary, and will be removed in a future
release of Jython once this logic has been upstreamed.

In addition, for cross-platform compatiblity, the wheel as built as
follows:

SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1 jpip wheel git+https://github.com/jythontools/setuptools.git

Fixes http://bugs.jython.org/issue2298

files:
  Lib/ensurepip/__init__.py                                     |    2 +-
  Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-14.3.2-py2.py3-none-any.whl |  Bin 
  3 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,7 +12,7 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "11.3.1"
+_SETUPTOOLS_VERSION = "14.3.2"
 
 _PIP_VERSION = "1.6"
 
diff --git a/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl
deleted file mode 100644
index 6892ff89b4f916c40a0044c18d4b41dbf73340e3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-14.3.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-14.3.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f983456bab03556737d6e04ba0be960a18007641
GIT binary patch
[stripped]

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