launchpad-reviewers team mailing list archive

[Colin Watson <mp+439054@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:ipython-7.9.0 into launchpad:master.

Commit message:
Upgrade to IPython 7.9.0

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/439054

This is admittedly a fair few new dependencies.  However, we were previously using a version of IPython from 2013 which produced a startup warning on Python 3.8, so it's about time to upgrade.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/439052
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:ipython-7.9.0 into launchpad:master.

diff --git a/lib/lp/scripts/harness.py b/lib/lp/scripts/harness.py
index a9ccdd8..21d914e 100644
--- a/lib/lp/scripts/harness.py
+++ b/lib/lp/scripts/harness.py
@@ -117,9 +117,6 @@ def python():
 
 
 def ipython():
-    from IPython.frontend.terminal.ipapp import TerminalIPythonApp
+    from IPython import start_ipython
 
-    app = TerminalIPythonApp.instance()
-    app.initialize(argv=[])
-    app.shell.user_ns.update(_get_locals())
-    app.start()
+    start_ipython(argv=[], user_ns=_get_locals())
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index e61b98b..fe1562d 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -13,6 +13,7 @@ appdirs==1.4.3
 asn1crypto==0.23.0
 attrs==19.3.0
 Automat==20.2.0
+backcall==0.2.0
 backports.functools-lru-cache==1.5
 # ztk-versions.cfg uses 3.2.0 on Python 3, but that drops support for Python
 # 3.5.  Pin to 3.1.7 until we no longer care about xenial.
@@ -38,6 +39,7 @@ cssutils==1.0.2
 Cython==0.29.17
 d2to1==0.2.12
 debtcollector==1.22.0
+decorator==5.1.1
 defusedxml==0.6.0
 difftacular==0.1
 distro==1.4.0
@@ -63,8 +65,10 @@ importlib==1.0.2
 importlib-metadata==2.1.1
 importlib-resources==0.5
 incremental==21.3.0
-ipython==0.13.2
+ipython==7.9.0
+ipython-genutils==0.2.0
 iso8601==0.1.12
+jedi==0.17.2
 jmespath==0.10.0
 jsautobuild==0.2
 keyring==0.6.2
@@ -110,18 +114,23 @@ oslo.i18n==3.25.1
 oslo.serialization==2.29.3
 oslo.utils==3.42.1
 paramiko==2.4.1
+parso==0.7.1
 Paste==3.5.2
 PasteDeploy==2.1.0
 pathlib2==2.3.2
 patiencediff==0.2.2
+pexpect==4.8.0
 pgbouncer==0.0.9
+pickleshare==0.7.5
 # pkginfo 1.7.0 dropped Python 3.5 support, but we need the features of the
 # newer version, and both our and the package's test suite show no
 # incompatibilities
 pkginfo==1.8.2
 prettytable==0.7.2
+prompt-toolkit==2.0.10
 psutil==5.4.2
 psycopg2==2.8.6
+ptyprocess==0.7.0
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pygettextpo==0.2
@@ -168,6 +177,7 @@ testresources==0.2.7
 testscenarios==0.4
 testtools==2.5.0
 timeline==0.0.7
+traitlets==4.3.3
 transaction==3.0.1
 treq==18.6.0
 # lp:~launchpad/twisted:lp-backport
@@ -181,6 +191,7 @@ vine==1.3.0
 virtualenv-tools3==2.0.5
 wadllib==1.3.6
 waitress==1.3.1
+wcwidth==0.2.6
 webencodings==0.5.1
 WebOb==1.8.5
 WebTest==2.0.35