On Tue 21/07/2020 16:15, Bjorn Ketelaars wrote:
> On Tue 14/07/2020 18:51, Bjorn Ketelaars wrote:
> > Diff below brings ipython to 7.16.1, which is a jump forward from what
> > we currently have in ports. List of changes/additions is long, and can
> > be found at https://ipython.readthedocs.io/en/stable/whatsnew/.
> > 
> > Note that this update depends on an update of devel/py-prompt_toolkit,
> > which will be send to ports@ in a separate mail.
> > 
> > Testing:
> > - 'make test' runs successfully
> > - build tested all consumers
> > - run tested on amd64
> > - run tested several consumers, i.e. the jupyter-notebook stuff and
> >   py-qtconsole, on amd64
> > 
> > Comments/OK?
> 
> Ping!
> 
> Diff enclosed for your convenience.

Ping!

Please note that this update depends on a newer version of
devel/py-prompt_toolkit:

(https://marc.info/?l=openbsd-ports&m=159474553905853&w=2)


diff --git Makefile Makefile
index 78f7ffb2752..c502b544590 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =              enhanced interactive Python shell
 
-MODPY_EGG_VERSION =    5.10.0
+MODPY_EGG_VERSION =    7.16.1
 DISTNAME =             ipython-${MODPY_EGG_VERSION}
 PKGNAME =              ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
 
@@ -18,29 +18,31 @@ PERMIT_PACKAGE =    Yes
 MODULES =              lang/python
 MODPY_PI =             Yes
 
+# Optional dependency which gets picked up if it happens to be installed, thus
+# causing race conditions under dpb. Pull it in to avoid this possibility.
+BUILD_DEPENDS =                www/py-mako${MODPY_FLAVOR}
+
 RUN_DEPENDS =          databases/py-pickleshare${MODPY_FLAVOR} \
                        devel/desktop-file-utils \
+                       devel/py-backcall${MODPY_FLAVOR} \
                        devel/py-decorator${MODPY_FLAVOR} \
+                       devel/py-jedi${MODPY_FLAVOR}>=0.10 \
                        devel/py-pexpect${MODPY_FLAVOR} \
-                       devel/py-prompt_toolkit${MODPY_FLAVOR} \
-                       devel/py-simplegeneric${MODPY_FLAVOR}>0.8 \
+                       
devel/py-prompt_toolkit${MODPY_FLAVOR}>=2.0.0v1,<3.1.0v1 \
                        devel/py-traitlets${MODPY_FLAVOR}>=4.2 \
-                       math/py-numpy${MODPY_FLAVOR} \
-                       textproc/py-pygments${MODPY_FLAVOR}<2.6
+                       textproc/py-pygments${MODPY_FLAVOR}
 
-# Note that if you have pdb++ installed, tests will fail.
+# Note that if you have pdb++ installed OR are using PORTS_PRIVSEP, tests will
+# fail.
 TEST_DEPENDS =         ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
                        devel/py-ipykernel${MODPY_FLAVOR} \
-                       devel/py-nbformat${MODPY_FLAVOR}>=4.2.0 \
-                       devel/py-nose${MODPY_FLAVOR} \
+                       devel/py-nbformat${MODPY_FLAVOR} \
+                       devel/py-nose${MODPY_FLAVOR}>=0.10.1 \
                        devel/py-testpath${MODPY_FLAVOR} \
-                       graphics/py-matplotlib${MODPY_FLAVOR} \
+                       math/py-numpy${MODPY_FLAVOR}>=1.14 \
+                       textproc/py-pygments${MODPY_FLAVOR} \
                        www/py-requests${MODPY_FLAVOR}
 
-# Optional dependency which gets picked up if it happens to be installed, thus
-# causing race conditions under dpb. Pull it in to avoid this possibility.
-BUILD_DEPENDS +=       www/py-mako${MODPY_FLAVOR}
-
 FLAVORS =              python3
 FLAVOR =               python3
 
@@ -60,7 +62,6 @@ pre-build:
        ${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
        ${SUBST_CMD} ${WRKBUILD}/examples/IPython\ Kernel/ipython.desktop
 
-# XXX Some tests fail with PORTS_PRIVSEP
 do-test:
        env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
                ${LOCALBASE}/bin/iptest
diff --git distinfo distinfo
index 0ce1d512f6a..4a298ab8250 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipython-5.10.0.tar.gz) = 0fni0CuwkA3e97avEUrKOlzz3EO53h8Z03xK7bxyT+4=
-SIZE (ipython-5.10.0.tar.gz) = 4978748
+SHA256 (ipython-7.16.1.tar.gz) = n0/LMdOyxTMzOJO5FyJk5IIcGskYOVAPMb1D8sWbPM8=
+SIZE (ipython-7.16.1.tar.gz) = 5136303
diff --git patches/patch-IPython_core_interactiveshell_py 
patches/patch-IPython_core_interactiveshell_py
deleted file mode 100644
index 6900d31bae3..00000000000
--- patches/patch-IPython_core_interactiveshell_py
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-IPython_core_interactiveshell_py,v 1.1 2020/07/08 13:01:23 
bket Exp $
-
-IPython is broken on python-3.8, due to changes to ast.Module. Taken from
-https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1715405.html
-
-Index: IPython/core/interactiveshell.py
---- IPython/core/interactiveshell.py.orig
-+++ IPython/core/interactiveshell.py
-@@ -2813,7 +2813,7 @@ class InteractiveShell(SingletonConfigurable):
- 
-         try:
-             for i, node in enumerate(to_run_exec):
--                mod = ast.Module([node])
-+                mod = ast.Module([node], [])
-                 code = compiler(mod, cell_name, "exec")
-                 if self.run_code(code, result):
-                     return True
diff --git patches/patch-IPython_core_tests_test_interactiveshell_py 
patches/patch-IPython_core_tests_test_interactiveshell_py
index 318f2679f13..1580f47436a 100644
--- patches/patch-IPython_core_tests_test_interactiveshell_py
+++ patches/patch-IPython_core_tests_test_interactiveshell_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-IPython_core_tests_test_interactiveshell_py,v 1.5 2016/12/13 
14:50:45 shadchin Exp $
---- IPython/core/tests/test_interactiveshell.py.orig   Sat Aug 13 17:56:43 2016
-+++ IPython/core/tests/test_interactiveshell.py        Fri Aug 19 19:59:00 2016
-@@ -579,7 +579,7 @@ class TestSystemRaw(unittest.TestCase, ExitCodeChecks)
+Index: IPython/core/tests/test_interactiveshell.py
+--- IPython/core/tests/test_interactiveshell.py.orig
++++ IPython/core/tests/test_interactiveshell.py
+@@ -572,7 +572,7 @@ class TestSystemRaw(ExitCodeChecks):
      def test_1(self):
          """Test system_raw with non-ascii cmd
          """
diff --git patches/patch-IPython_testing_plugin_Makefile 
patches/patch-IPython_testing_plugin_Makefile
deleted file mode 100644
index f6339eb4680..00000000000
--- patches/patch-IPython_testing_plugin_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-IPython_testing_plugin_Makefile,v 1.1 2013/11/04 11:31:12 edd 
Exp $
---- IPython/testing/plugin/Makefile.orig       Sat Nov  2 14:48:00 2013
-+++ IPython/testing/plugin/Makefile    Sat Nov  2 14:48:18 2013
-@@ -67,7 +67,7 @@ all: base ipython
- 
- # Main plugin and cleanup
- IPython_doctest_plugin.egg-info: $(SRC)
--      python setup.py install --prefix=$(PREFIX)
-+      ${MODPY_BIN} setup.py install --prefix=$(PREFIX)
-       touch $@
- 
- clean:
diff --git patches/patch-setupbase_py patches/patch-setupbase_py
index dc04c19a2a5..6dec1ce1e0e 100644
--- patches/patch-setupbase_py
+++ patches/patch-setupbase_py
@@ -2,14 +2,15 @@ $OpenBSD: patch-setupbase_py,v 1.7 2016/12/13 14:50:45 
shadchin Exp $
 
 Put man pages where they belong.
 
---- setupbase.py.orig  Sat Aug 13 17:56:43 2016
-+++ setupbase.py       Fri Aug 19 19:59:00 2016
-@@ -203,7 +203,7 @@ def find_data_files():
+Index: setupbase.py
+--- setupbase.py.orig
++++ setupbase.py
+@@ -162,7 +162,7 @@ def find_data_files():
      Just man pages at this point.
      """
  
--    manpagebase = pjoin('share', 'man', 'man1')
-+    manpagebase = pjoin('man', 'man1')
- 
-     # Simple file lists can be made by hand
-     manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)]
+-    if "freebsd" in sys.platform:
++    if "freebsd" or "openbsd" in sys.platform:
+         manpagebase = pjoin('man', 'man1')
+     else:
+         manpagebase = pjoin('share', 'man', 'man1')
diff --git pkg/PLIST pkg/PLIST
index e720dbcffa7..2e736cf10e8 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -14,6 +14,7 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}consoleapp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}frontend.${MODPY_PYC_MAGIC_TAG}pyc
@@ -24,6 +25,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}parallel.${MODP
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}paths.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/config.py
+lib/python${MODPY_VERSION}/site-packages/IPython/conftest.py
 lib/python${MODPY_VERSION}/site-packages/IPython/consoleapp.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/
 lib/python${MODPY_VERSION}/site-packages/IPython/core/__init__.py
@@ -31,6 +33,7 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PY
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}async_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}autocall.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}builtin_trap.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}compilerop.${MODPY_PYC_MAGIC_TAG}pyc
@@ -53,6 +56,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}historyapp
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}hooks.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}inputsplitter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}inputtransformer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}inputtransformer2.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}interactiveshell.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}latex_symbols.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
@@ -69,13 +73,13 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}profiledir
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}prompts.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}pylabtools.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}release.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}shadowns.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}shellapp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}splitinput.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}ultratb.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/${MODPY_PYCACHE}usage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/core/alias.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/application.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/async_helpers.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/autocall.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/builtin_trap.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/compilerop.py
@@ -98,6 +102,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/historyapp.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/hooks.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/inputsplitter.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/inputtransformer.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/inputtransformer2.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/interactiveshell.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/latex_symbols.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/logger.py
@@ -119,6 +124,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}his
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}namespace.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}osm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}packaging.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}pylab.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/${MODPY_PYCACHE}script.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/auto.py
@@ -132,6 +138,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/history.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/logging.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/namespace.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/osm.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/packaging.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/pylab.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/magics/script.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/oinspect.py
@@ -146,7 +153,6 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/profiledir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/prompts.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/pylabtools.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/release.py
-lib/python${MODPY_VERSION}/site-packages/IPython/core/shadowns.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/shellapp.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/splitinput.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/
@@ -164,6 +170,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}simp
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}tclass.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_alias.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_async_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_autocall.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_compilerop.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_completer.${MODPY_PYC_MAGIC_TAG}pyc
@@ -180,6 +187,8 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_imports.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_inputsplitter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_inputtransformer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_inputtransformer2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_inputtransformer2_line.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_interactiveshell.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_iplib.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/${MODPY_PYCACHE}test_logger.${MODPY_PYC_MAGIC_TAG}pyc
@@ -210,6 +219,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/simpleerr.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/tclass.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_alias.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_application.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_async_helpers.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_autocall.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_compilerop.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_completer.py
@@ -226,6 +236,8 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_hooks.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_imports.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_inputsplitter.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_inputtransformer.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_inputtransformer2.py
+lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_inputtransformer2_line.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_interactiveshell.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_iplib.py
 lib/python${MODPY_VERSION}/site-packages/IPython/core/tests/test_logger.py
@@ -281,10 +293,8 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/external/decora
 
lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/${MODPY_PYCACHE}_decorators.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/${MODPY_PYCACHE}_numpy_testing_noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/${MODPY_PYCACHE}_numpy_testing_utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/_decorators.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/_numpy_testing_noseclasses.py
-lib/python${MODPY_VERSION}/site-packages/IPython/external/decorators/_numpy_testing_utils.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/mathjax.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/qt_for_kernel.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/qt_loaders.py
@@ -431,6 +441,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}glut.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}gtk.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}gtk3.${MODPY_PYC_MAGIC_TAG}pyc
@@ -439,6 +450,7 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}tk.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/${MODPY_PYCACHE}wx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/asyncio.py
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/glut.py
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/gtk.py
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/pt_inputhooks/gtk3.py
@@ -454,9 +466,11 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}test_debug_magic.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}test_embed.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}test_help.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/${MODPY_PYCACHE}test_interactivshell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/test_debug_magic.py
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/test_embed.py
 lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/test_help.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/terminal/tests/test_interactivshell.py
@@ -522,16 +536,12 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}PyColorize.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_get_terminal_size.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_cli.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_win32.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_win32_controller.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_signatures.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_sysinfo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_tokenize_py2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_tokenize_py3.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}colorable.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}coloransi.${MODPY_PYC_MAGIC_TAG}pyc
@@ -556,7 +566,6 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}path.${MO
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}pickleutil.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}rlineimpl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}sentinel.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}shimmodule.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}signatures.${MODPY_PYC_MAGIC_TAG}pyc
@@ -567,24 +576,18 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}tempdir.$
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}timing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}tokenize2.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}tokenutil.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}traitlets.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}tz.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}ulinecache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}warn.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}wildcard.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/_get_terminal_size.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_cli.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_common.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_posix.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32.py
 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32_controller.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/_signatures.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/_sysinfo.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/_tokenize_py2.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/_tokenize_py3.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/capture.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/colorable.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/coloransi.py
@@ -609,7 +612,6 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/path.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/pickleutil.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/process.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/py3compat.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/rlineimpl.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/sentinel.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/shimmodule.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/signatures.py
@@ -658,13 +660,11 @@ 
lib/python${MODPY_VERSION}/site-packages/IPython/utils/tests/test_tokenutil.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/tests/test_wildcard.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/text.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/timing.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/tokenize2.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/tokenutil.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/traitlets.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/tz.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/ulinecache.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/version.py
-lib/python${MODPY_VERSION}/site-packages/IPython/utils/warn.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/wildcard.py
 
lib/python${MODPY_VERSION}/site-packages/ipython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 @tag update-desktop-database

Reply via email to