Index: head/devel/ipython/files/patch-IPython_core_completer.py =================================================================== --- head/devel/ipython/files/patch-IPython_core_completer.py (revision 564941) +++ head/devel/ipython/files/patch-IPython_core_completer.py (nonexistent) @@ -1,41 +0,0 @@ ---- IPython/core/completer.py.orig 2020-10-30 18:09:09 UTC -+++ IPython/core/completer.py -@@ -988,8 +988,18 @@ def _make_signature(completion)-> str: - - """ - -- return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) -+ # it looks like this might work on jedi 0.17 -+ if hasattr(completion, 'get_signatures'): -+ signatures = completion.get_signatures() -+ if not signatures: -+ return '(?)' - -+ c0 = completion.get_signatures()[0] -+ return '('+c0.to_string().split('(', maxsplit=1)[1] -+ -+ return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures() -+ for p in signature.defined_names()) if f]) -+ - class IPCompleter(Completer): - """Extension of the completer class with IPython-specific features""" - -@@ -1370,8 +1380,7 @@ class IPCompleter(Completer): - else: - raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) - -- interpreter = jedi.Interpreter( -- text[:offset], namespaces, column=cursor_column, line=cursor_line + 1) -+ interpreter = jedi.Interpreter(text[:offset], namespaces) - try_jedi = True - - try: -@@ -1398,7 +1407,7 @@ class IPCompleter(Completer): - if not try_jedi: - return [] - try: -- return filter(completion_filter, interpreter.completions()) -+ return filter(completion_filter, interpreter.complete(column=cursor_column, line=cursor_line + 1)) - except Exception as e: - if self.debug: - return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] Property changes on: head/devel/ipython/files/patch-IPython_core_completer.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ipython/files/patch-IPython_terminal_ptutils.py =================================================================== --- head/devel/ipython/files/patch-IPython_terminal_ptutils.py (revision 564941) +++ head/devel/ipython/files/patch-IPython_terminal_ptutils.py (nonexistent) @@ -1,11 +0,0 @@ ---- IPython/terminal/ptutils.py.orig 2020-10-30 18:09:09 UTC -+++ IPython/terminal/ptutils.py -@@ -20,6 +20,8 @@ from prompt_toolkit.patch_stdout import patch_stdout - - import pygments.lexers as pygments_lexers - import os -+import sys -+import traceback - - _completion_sentinel = object() - Property changes on: head/devel/ipython/files/patch-IPython_terminal_ptutils.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ipython/Makefile =================================================================== --- head/devel/ipython/Makefile (revision 564941) +++ head/devel/ipython/Makefile (revision 564942) @@ -1,39 +1,38 @@ # Created by: Dryice Liu # $FreeBSD$ PORTNAME= ipython -PORTVERSION= 7.19.0 -PORTREVISION= 3 +PORTVERSION= 7.20.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= Enhanced Interactive Python shell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.rst RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backcall>=0:devel/py-backcall@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jedi>=0.10:devel/py-jedi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jedi>=0.16:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=4.3:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=2.0.0<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR} USES= python:3.7+ USE_PYTHON= autoplist distutils NO_ARCH= yes PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES post-install-EXAMPLES-on: cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/ipython/distinfo =================================================================== --- head/devel/ipython/distinfo (revision 564941) +++ head/devel/ipython/distinfo (revision 564942) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604187140 -SHA256 (ipython-7.19.0.tar.gz) = cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a -SIZE (ipython-7.19.0.tar.gz) = 5225775 +TIMESTAMP = 1613048409 +SHA256 (ipython-7.20.0.tar.gz) = 1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e +SIZE (ipython-7.20.0.tar.gz) = 5140776