Update BASE_DEPENDENCIES to modern setuptools & pip
The version of pip used to bootstrap virtualenvs was too old to run
portage's setup.py. Included a wheel for the new pinned pip version and
updated the versions in BASE_DEPENDENCIES to the newest wheels that
support both py2 and py3.
BUG=chromium:1060214
TEST=create_venv3
TEST=chromite unittests
Change-Id: I47a02155034637c1da0df0f54ed796770e2548bb
diff --git a/pip_packages/pip-20.0.2-py2.py3-none-any.whl b/pip_packages/pip-20.0.2-py2.py3-none-any.whl
new file mode 100644
index 0000000..318c448
--- /dev/null
+++ b/pip_packages/pip-20.0.2-py2.py3-none-any.whl
Binary files differ
diff --git a/venv/cros_venv/test_venvlib.py b/venv/cros_venv/test_venvlib.py
index 36c8f05..0d888e7 100644
--- a/venv/cros_venv/test_venvlib.py
+++ b/venv/cros_venv/test_venvlib.py
@@ -269,4 +269,4 @@
with venvlib._make_reqs_file(spec) as f, \
open(f.name, 'r') as rfile:
self.assertEqual(rfile.read(),
- 'setuptools==28.2.0\npip==8.1.2\nfoo==1.0.0\n')
+ 'setuptools==44.0.0\npip==20.0.2\nfoo==1.0.0\n')
diff --git a/venv/cros_venv/venvlib.py b/venv/cros_venv/venvlib.py
index b0eef45..adb6784 100644
--- a/venv/cros_venv/venvlib.py
+++ b/venv/cros_venv/venvlib.py
@@ -33,7 +33,7 @@
# BASE_DEPENDENCIES are pip requirements automatically included in every
# virtualenv so we have control over which versions of bootstrap
# packages are installed.
-_BASE_DEPENDENCIES = ('setuptools==28.2.0', 'pip==8.1.2')
+_BASE_DEPENDENCIES = ('setuptools==44.0.0', 'pip==20.0.2')
class _VenvPaths(object):
diff --git a/venv/requirements.txt b/venv/requirements.txt
index 90219cc..4ecb1b5 100644
--- a/venv/requirements.txt
+++ b/venv/requirements.txt
@@ -2,11 +2,11 @@
funcsigs==1.0.2
mock==2.0.0
pbr==1.10.0
-pip==8.1.2
+pip==20.0.2
py==1.4.34
pytest==3.1.3
pytest-cov==2.5.1; python_version < '3'
-setuptools==28.2.0
+setuptools==44.0.0
six==1.10.0
subprocess32==3.2.7; python_version < '3.3'
wheel==0.30.0
