Index: head/devel/ipython/Makefile =================================================================== --- head/devel/ipython/Makefile (revision 562649) +++ head/devel/ipython/Makefile (revision 562650) @@ -1,39 +1,39 @@ # Created by: Dryice Liu # $FreeBSD$ PORTNAME= ipython PORTVERSION= 7.19.0 -PORTREVISION= 2 +PORTREVISION= 3 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}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/files/patch-autocompletion-fix =================================================================== --- head/devel/ipython/files/patch-autocompletion-fix (revision 562649) +++ head/devel/ipython/files/patch-autocompletion-fix (nonexistent) @@ -1,74 +0,0 @@ -From dcd9dc90aee7e4c5c52ce44c18e7518934790612 Mon Sep 17 00:00:00 2001 -From: gorogoroumaru -Date: Fri, 10 Apr 2020 10:24:52 +0900 -Subject: [PATCH] Fix DeprecationWarning on autocompletion with jedi 0.17.0 - ---- - IPython/core/completer.py | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/IPython/core/completer.py b/IPython/core/completer.py -index 16fbb81f55..01730fff2d 100644 ---- IPython/core/completer.py -+++ IPython/core/completer.py -@@ -110,26 +110,23 @@ - # Copyright (C) 2001 Python Software Foundation, www.python.org - - --import __main__ - import builtins as builtin_mod - import glob --import time - import inspect - import itertools - import keyword - import os - import re -+import string - import sys -+import time - import unicodedata --import string - import warnings -- - from contextlib import contextmanager - from importlib import import_module --from typing import Iterator, List, Tuple, Iterable - from types import SimpleNamespace -+from typing import Iterable, Iterator, List, Tuple - --from traitlets.config.configurable import Configurable - from IPython.core.error import TryNext - from IPython.core.inputtransformer2 import ESC_MAGIC - from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol -@@ -137,7 +134,10 @@ - from IPython.utils import generics - from IPython.utils.dir2 import dir2, get_real_method - from IPython.utils.process import arg_split --from traitlets import Bool, Enum, observe, Int -+from traitlets import Bool, Enum, Int, observe -+from traitlets.config.configurable import Configurable -+ -+import __main__ - - # skip module docstests - skip_doctest = True -@@ -1380,8 +1380,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): - 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: -@@ -1408,7 +1407,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): - 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-autocompletion-fix ___________________________________________________________________ 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_core_completer.py =================================================================== --- head/devel/ipython/files/patch-IPython_core_completer.py (nonexistent) +++ head/devel/ipython/files/patch-IPython_core_completer.py (revision 562650) @@ -0,0 +1,41 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +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 (nonexistent) +++ head/devel/ipython/files/patch-IPython_terminal_ptutils.py (revision 562650) @@ -0,0 +1,11 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property