From owner-svn-ports-head@freebsd.org Tue Apr 16 23:50:25 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07AB115812E5; Tue, 16 Apr 2019 23:50:25 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C57BD8692E; Tue, 16 Apr 2019 23:50:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E5B826D92; Tue, 16 Apr 2019 23:50:22 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3GNoM7Z037427; Tue, 16 Apr 2019 23:50:22 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3GNoLFM037424; Tue, 16 Apr 2019 23:50:21 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201904162350.x3GNoLFM037424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 16 Apr 2019 23:50:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499139 - in head/devel/py-http-prompt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/devel/py-http-prompt: . files X-SVN-Commit-Revision: 499139 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C57BD8692E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2019 23:50:25 -0000 Author: sunpoet Date: Tue Apr 16 23:50:21 2019 New Revision: 499139 URL: https://svnweb.freebsd.org/changeset/ports/499139 Log: Allow build with py-prompt_toolkit 2.x - Bump PORTREVISION for package change Obtained from: https://github.com/jonathanslenders/http-prompt/commit/34de86178d8ae2b478e0ad989222aab24dd4c046 https://github.com/jonathanslenders/http-prompt/commit/d3d84de2aa7f3fce521e5ac63f4bbcf9a2166501 Approved by: dbaio (maintainer) Added: head/devel/py-http-prompt/files/patch-http_prompt-cli.py (contents, props changed) head/devel/py-http-prompt/files/patch-http_prompt-utils.py (contents, props changed) head/devel/py-http-prompt/files/patch-requirements.txt (contents, props changed) Modified: head/devel/py-http-prompt/Makefile Modified: head/devel/py-http-prompt/Makefile ============================================================================== --- head/devel/py-http-prompt/Makefile Tue Apr 16 23:50:15 2019 (r499138) +++ head/devel/py-http-prompt/Makefile Tue Apr 16 23:50:21 2019 (r499139) @@ -2,6 +2,7 @@ PORTNAME= http-prompt PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.0:devel/py-prompt_toolkit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=2.0.0:devel/py-prompt_toolkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie@${PY_FLAVOR} Added: head/devel/py-http-prompt/files/patch-http_prompt-cli.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-http-prompt/files/patch-http_prompt-cli.py Tue Apr 16 23:50:21 2019 (r499139) @@ -0,0 +1,40 @@ +Obtained from: https://github.com/jonathanslenders/http-prompt/commit/34de86178d8ae2b478e0ad989222aab24dd4c046 + https://github.com/jonathanslenders/http-prompt/commit/d3d84de2aa7f3fce521e5ac63f4bbcf9a2166501 + +--- http_prompt/cli.py.orig 2018-11-04 14:03:53 UTC ++++ http_prompt/cli.py +@@ -9,11 +9,11 @@ import click + + from httpie.plugins import FormatterPlugin # noqa, avoid cyclic import + from httpie.output.formatters.colors import Solarized256Style +-from prompt_toolkit import prompt, AbortAction ++from prompt_toolkit import prompt + from prompt_toolkit.auto_suggest import AutoSuggestFromHistory + from prompt_toolkit.history import FileHistory +-from prompt_toolkit.layout.lexers import PygmentsLexer +-from prompt_toolkit.styles.from_pygments import style_from_pygments ++from prompt_toolkit.lexers import PygmentsLexer ++from prompt_toolkit.styles.pygments import style_from_pygments_cls + from pygments.styles import get_style_by_name + from pygments.util import ClassNotFound + from six.moves.http_cookies import SimpleCookie +@@ -135,7 +135,7 @@ def cli(spec, env, url, http_options): + style_class = get_style_by_name(cfg['command_style']) + except ClassNotFound: + style_class = Solarized256Style +- style = style_from_pygments(style_class) ++ style = style_from_pygments_cls(style_class) + + listener = ExecutionListener(cfg) + +@@ -159,7 +159,9 @@ def cli(spec, env, url, http_options): + text = prompt('%s> ' % context.url, completer=completer, + lexer=lexer, style=style, history=history, + auto_suggest=AutoSuggestFromHistory(), +- on_abort=AbortAction.RETRY, vi_mode=cfg['vi']) ++ vi_mode=cfg['vi']) ++ except KeyboardInterrupt: ++ continue # Control-C pressed + except EOFError: + break # Control-D pressed + else: Added: head/devel/py-http-prompt/files/patch-http_prompt-utils.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-http-prompt/files/patch-http_prompt-utils.py Tue Apr 16 23:50:21 2019 (r499139) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/jonathanslenders/http-prompt/commit/34de86178d8ae2b478e0ad989222aab24dd4c046 + +--- http_prompt/utils.py.orig 2018-11-04 14:03:53 UTC ++++ http_prompt/utils.py +@@ -3,7 +3,7 @@ from __future__ import unicode_literals + import math + import re + +-from prompt_toolkit.shortcuts import create_output ++from prompt_toolkit.output.defaults import create_output + from six.moves import range + + Added: head/devel/py-http-prompt/files/patch-requirements.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-http-prompt/files/patch-requirements.txt Tue Apr 16 23:50:21 2019 (r499139) @@ -0,0 +1,12 @@ +Obtained from: https://github.com/jonathanslenders/http-prompt/commit/34de86178d8ae2b478e0ad989222aab24dd4c046 + +--- requirements.txt.orig 2018-11-04 14:03:53 UTC ++++ requirements.txt +@@ -1,6 +1,6 @@ + click>=5.0 + httpie>=0.9.2 + parsimonious>=0.6.2 +-prompt-toolkit>=1.0.0,<2.0.0 ++prompt-toolkit>=2.0.0,<2.1.0 + Pygments>=2.1.0 + six>=1.10.0