From 6415c2c1c23cfdbfe15e27cdc924de2e8b340b14 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 21 Jan 2020 12:07:58 +0000 Subject: [PATCH 1/2] Work around broken pip release. --- python/mach_bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index 049dff4b7e73..db67fda2fdfd 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -197,7 +197,7 @@ def _activate_virtualenv(topdir, is_firefox): if need_pip_upgrade: # Upgrade pip when virtualenv is created to fix the issue # https://github.com/servo/servo/issues/11074 - _process_exec([python, "-m", "pip", "install", "-I", "-U", "pip"]) + _process_exec([python, "-m", "pip", "install", "-I", "-U", "pip==19.3.1"]) for req_rel_path in requirements_paths: req_path = os.path.join(topdir, req_rel_path) From 6669ba36d2f677ef7b64972d69d43cc7a12b73ea Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 21 Jan 2020 12:11:13 +0000 Subject: [PATCH 2/2] Try using an upper limit instead. --- python/mach_bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index db67fda2fdfd..d63fe3f357af 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -197,7 +197,7 @@ def _activate_virtualenv(topdir, is_firefox): if need_pip_upgrade: # Upgrade pip when virtualenv is created to fix the issue # https://github.com/servo/servo/issues/11074 - _process_exec([python, "-m", "pip", "install", "-I", "-U", "pip==19.3.1"]) + _process_exec([python, "-m", "pip", "install", "-I", "-U", "pip<20"]) for req_rel_path in requirements_paths: req_path = os.path.join(topdir, req_rel_path)