From 46647cb2f76bad858682a8baf7f002e3ce873196 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 26 May 2021 09:00:07 -0700
Subject: [PATCH] pin back pip

---
 tools/pinning/pyproject.toml | 4 ++++
 tools/requirements.txt       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/pinning/pyproject.toml b/tools/pinning/pyproject.toml
index 002d8d816..c6f216a01 100644
--- a/tools/pinning/pyproject.toml
+++ b/tools/pinning/pyproject.toml
@@ -58,6 +58,10 @@ cython = "*"
 # needed. This dependency can be removed here once Certbot's support for the
 # 3rd party mock library has been dropped.
 mock = "*"
+# pip's new dependency resolver fails on local packages that depend on each
+# other when those packages are requested with extras such as 'certbot[dev]' so
+# let's pin it back for now. See https://github.com/pypa/pip/issues/9204.
+pip = "20.2.4"
 # poetry 1.2.0+ is required for it to pin pip, setuptools, and wheel. See
 # https://github.com/python-poetry/poetry/issues/1584. This version is required
 # here in addition to certbot/setup.py because otherwise the pre-release
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 50d04c4d2..20038ca09 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -101,7 +101,7 @@ parso==0.8.2; python_version == "3.6"
 pathlib2==2.3.5; python_version >= "3.6"
 pexpect==4.8.0; python_version >= "3.6" and python_version < "4.0" or python_version == "3.6" and sys_platform != "win32" or python_version >= "3.7" and sys_platform != "win32"
 pickleshare==0.7.5; python_version == "3.6" or python_version >= "3.7"
-pip==21.1.2; python_version >= "3.6"
+pip==20.2.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 pkginfo==1.7.0; python_version >= "3.6" and python_version < "4.0" or python_version >= "3.6"
 pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" or python_version >= "3.6" and python_full_version >= "3.5.0"
 ply==3.11; python_version >= "3.6"