Backed out changeset fdf92ddfbf86 (bug 1464038) for causing nightly bustages after virtualenv upgrade to 16.0.0 a=backout

Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 
 [packages]
 pipenv = "==2018.5.18"
-virtualenv = "==16.0.0"
+virtualenv = "==15.2.0"
 
 [requires]
 python_version = "2.7"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0804214e01d3aed00ba67bc15900849d57af5293b467257b19a83007ddaa47b9"
+            "sha256": "bad1afe9071c33c7547e277c2ce4817e2c20e4039bccfc4e62595f30eb637f98"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -33,11 +33,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669",
-                "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752"
+                "sha256:1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54",
+                "sha256:e8e05d4714a1c51a2f5921e62f547fcb0f713ebbe959e0a7f585cc8bef71d11f"
             ],
             "index": "pypi",
-            "version": "==16.0.0"
+            "version": "==15.2.0"
         },
         "virtualenv-clone": {
             "hashes": [

third_party/python/virtualenv/PKG-INFO

@@ -1,12 +1,10 @@
-Metadata-Version: 1.2
+Metadata-Version: 1.1
 Name: virtualenv
-Version: 16.0.0
+Version: 15.2.0
 Summary: Virtual Python Environment builder
 Home-page: https://virtualenv.pypa.io/
-Author: Ian Bicking
-Author-email: ianb@colorstudy.com
-Maintainer: Jannis Leidel, Carl Meyer and Brian Rosner
-Maintainer-email: python-virtualenv@groups.google.com
+Author: Jannis Leidel, Carl Meyer and Brian Rosner
+Author-email: python-virtualenv@groups.google.com
 License: MIT
 Description: Virtualenv
         ==========
@@ -49,18 +47,6 @@ Description: Virtualenv
         Release History
         ===============
         
-        16.0.0 (2018-05-16)
-        -------------------
-        
-        * Drop support for Python 2.6.
-        
-        * Upgrade pip to 10.0.1.
-        
-        * Upgrade setuptools to 39.1.0.
-        
-        * Upgrade wheel to 0.31.1.
-        
-        
         15.2.0 (2018-03-21)
         -------------------
         
@@ -71,6 +57,18 @@ Description: Virtualenv
         * Upgrade wheel to 0.30.0.
         
         
+        15.1.0 (2016-11-15)
+        -------------------
+        
+        * Support Python 3.6.
+        
+        * Upgrade setuptools to 28.0.0.
+        
+        * Upgrade pip to 9.0.1.
+        
+        * Don't install pre-release versions of pip, setuptools, or wheel from PyPI.
+        
+        
         `Full Changelog <https://virtualenv.pypa.io/en/latest/changes.html>`_.
 Keywords: setuptools deployment installation distutils
 Platform: UNKNOWN
@@ -78,9 +76,9 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
-Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*

third_party/python/virtualenv/docs/changes.rst

@@ -1,18 +1,6 @@
 Release History
 ===============
 
-16.0.0 (2018-05-16)
--------------------
-
-* Drop support for Python 2.6.
-
-* Upgrade pip to 10.0.1.
-
-* Upgrade setuptools to 39.1.0.
-
-* Upgrade wheel to 0.31.1.
-
-
 15.2.0 (2018-03-21)
 -------------------
 

third_party/python/virtualenv/docs/index.rst

@@ -45,6 +45,18 @@ doesn't access the globally installed libraries either).
    development
    changes
 
+.. warning::
+
+   Python bugfix releases 2.6.8, 2.7.3, 3.1.5 and 3.2.3 include a change that
+   will cause "import random" to fail with "cannot import name urandom" on any
+   virtualenv created on a Unix host with an earlier release of Python
+   2.6/2.7/3.1/3.2, if the underlying system Python is upgraded. This is due to
+   the fact that a virtualenv uses the system Python's standard library but
+   contains its own copy of the Python interpreter, so an upgrade to the system
+   Python results in a mismatch between the version of the Python interpreter
+   and the version of the standard library. It can be fixed by removing
+   ``$ENV/bin/python`` and re-running virtualenv on the same target directory
+   with the upgraded Python.
 
 Other Documentation and Links
 -----------------------------

third_party/python/virtualenv/setup.py

@@ -3,8 +3,8 @@ import re
 import shutil
 import sys
 
-if sys.version_info[:2] < (2, 7):
-    sys.exit('virtualenv requires Python 2.7 or higher.')
+if sys.version_info[:2] < (2, 6):
+    sys.exit('virtualenv requires Python 2.6 or higher.')
 
 try:
     from setuptools import setup
@@ -103,6 +103,7 @@ setup(
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
@@ -119,5 +120,4 @@ setup(
     py_modules=['virtualenv'],
     packages=['virtualenv_support'],
     package_data={'virtualenv_support': ['*.whl']},
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
     **setup_params)

third_party/python/virtualenv/virtualenv.py

@@ -37,12 +37,12 @@ try:
 except ImportError:
     import configparser as ConfigParser
 
-__version__ = "16.0.0"
+__version__ = "15.2.0"
 virtualenv_version = __version__  # legacy
 
-if sys.version_info < (2, 7):
+if sys.version_info < (2, 6):
     print('ERROR: %s' % sys.exc_info()[1])
-    print('ERROR: this script requires Python 2.7 or greater.')
+    print('ERROR: this script requires Python 2.6 or greater.')
     sys.exit(101)
 
 try:
@@ -931,13 +931,19 @@ def create_environment(home_dir, site_packages=False, clear=False,
     to_install = []
 
     if not no_setuptools:
-        to_install.append('setuptools')
+        if sys.version_info[:2] == (2, 6):
+            to_install.append('setuptools<37')
+        else:
+            to_install.append('setuptools')
 
     if not no_pip:
         to_install.append('pip')
 
     if not no_wheel:
-        to_install.append('wheel')
+        if sys.version_info[:2] == (2, 6):
+            to_install.append("wheel<0.30")
+        else:
+            to_install.append('wheel')
 
     if to_install:
         install_wheel(