From a502c2202d1397849ccfcf57c785270bf0ea0513 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Fri, 17 Jul 2020 11:30:36 -0700
Subject: [PATCH] Update to IPython with Python 3.8 support.

---
 certbot/setup.py             | 2 +-
 tools/dev_constraints.txt    | 7 +++++--
 tools/oldest_constraints.txt | 7 +++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/certbot/setup.py b/certbot/setup.py
index b2e0837d3..efa7e3c28 100644
--- a/certbot/setup.py
+++ b/certbot/setup.py
@@ -83,7 +83,6 @@ elif sys.version_info < (3,3):
 
 dev_extras = [
     'coverage',
-    'ipdb',
     'pytest',
     'pytest-cov',
     'pytest-xdist',
@@ -94,6 +93,7 @@ dev_extras = [
 
 dev3_extras = [
     'astroid',
+    'ipdb',
     'mypy',
     'pylint',
 ]
diff --git a/tools/dev_constraints.txt b/tools/dev_constraints.txt
index 6e692841b..31ca577d5 100644
--- a/tools/dev_constraints.txt
+++ b/tools/dev_constraints.txt
@@ -10,6 +10,7 @@ asn1crypto==0.22.0
 astroid==2.3.3
 attrs==17.3.0
 Babel==2.5.1
+backcall==0.2.0
 backports.functools-lru-cache==1.5
 backports.shutil-get-terminal-size==1.0.0
 backports.ssl-match-hostname==3.7.0.1
@@ -40,9 +41,10 @@ httplib2==0.10.3
 imagesize==0.7.1
 importlib-metadata==0.23
 ipdb==0.12.3
-ipython==5.8.0
+ipython==7.9.0
 ipython-genutils==0.2.0
 isort==4.3.21
+jedi==0.17.1
 Jinja2==2.9.6
 jmespath==0.9.4
 josepy==1.1.0
@@ -59,13 +61,14 @@ ndg-httpsclient==0.3.2
 oauth2client==4.0.0
 packaging==19.2
 paramiko==2.4.2
+parso==0.7.0
 pathlib2==2.3.5
 pexpect==4.7.0
 pickleshare==0.7.5
 pkginfo==1.4.2
 pluggy==0.13.0
 ply==3.4
-prompt-toolkit==1.0.18
+prompt-toolkit==2.0.10
 ptyprocess==0.6.0
 py==1.8.0
 pyasn1==0.1.9
diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt
index ff4b8361a..5145e3ddf 100644
--- a/tools/oldest_constraints.txt
+++ b/tools/oldest_constraints.txt
@@ -63,3 +63,10 @@ dns-lexicon==2.2.1
 # Tracking at https://github.com/certbot/certbot/issues/6473
 boto3==1.4.7
 botocore==1.7.41
+
+# Old certbot[dev] constraints
+# Old versions of certbot[dev] required ipdb and our normally pinned version of
+# ipython which ipdb depends on doesn't support Python 2 so we pin an older
+# version here to keep tests working while we have Python 2 support.
+ipython==5.8.0
+prompt-toolkit==1.0.18