<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a66c3c269c67e7ce5a83dc10cfefc26395e5d0d0">https://github.com/macports/macports-ports/commit/a66c3c269c67e7ce5a83dc10cfefc26395e5d0d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a66c3c269c6 http-prompt: update to version 2.1.0, sync python.default_version with httpie
</span>a66c3c269c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a66c3c269c67e7ce5a83dc10cfefc26395e5d0d0
</span>Author: Tair Sabyrgaliyev <tair.sabirgaliev@gmail.com>
AuthorDate: Sun Mar 21 18:27:41 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> http-prompt: update to version 2.1.0, sync python.default_version with httpie
</span>---
net/http-prompt/Portfile | 21 ++++----
net/http-prompt/files/patch-cli.py.diff | 57 ++++------------------
.../files/patch-test_interaction.py.diff | 11 +++++
net/http-prompt/files/patch-utils.py.diff | 16 +++---
4 files changed, 39 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/http-prompt/Portfile b/net/http-prompt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1663f35de25..2cec181dccf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/http-prompt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/http-prompt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup eliangcs http-prompt 1.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup eliangcs http-prompt 2.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
maintainers {lbschenkel @lbschenkel}
categories net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,24 +15,22 @@ long_description ${description}
</span> platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 14fcbea963f715df4edaedc5d2fbbb26ab15f617 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 63e25c04e30ae419f5353df229825633d4f6222a39f0406a5893bd306359cdd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 323848
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a946f0baa01a21d2374605128738593ce6e0c0ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cc360fdfce570f908f34bdfff5f9049c717c1b5d716af5b49c9e19a375063270 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 323308
</span>
patchfiles patch-cli.py.diff \
patch-utils.py.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-test_interaction.py.diff \
</span> patch-requirements.txt.diff
# It MUST match default_version of httpie
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 38
</span>
depends_lib-append port:py${python.version}-click \
port:py${python.version}-parsimonious \
port:py${python.version}-prompt_toolkit \
port:py${python.version}-pygments \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-requests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-six \
</span> port:httpie
python.link_binaries_suffix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +38,10 @@ python.link_binaries_suffix
</span> depends_test-append port:py${python.version}-mock \
port:py${python.version}-pexpect \
port:py${python.version}-pytest \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pytest-cov
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pytest-cov \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-twine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.cmd py.test-${python.branch}
test.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/http-prompt/files/patch-cli.py.diff b/net/http-prompt/files/patch-cli.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a5fcd19ffd..f89157f6d01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/http-prompt/files/patch-cli.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/http-prompt/files/patch-cli.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- http_prompt/cli.py.orig 2019-03-11 10:35:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ http_prompt/cli.py 2019-03-11 10:36:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,11 +9,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- http_prompt/cli.py.orig 2021-03-05 17:17:16.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ http_prompt/cli.py 2021-03-21 17:36:10.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,11 +13,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> from httpie.plugins import FormatterPlugin # noqa, avoid cyclic import
from httpie.output.formatters.colors import Solarized256Style
-from prompt_toolkit import prompt, AbortAction
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,56 +14,17 @@
</span> +from prompt_toolkit.styles.pygments import style_from_pygments_cls
from pygments.styles import get_style_by_name
from pygments.util import ClassNotFound
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from six.moves.http_cookies import SimpleCookie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cookie = SimpleCookie(base_value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for k, v in cookies.items():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cookie[k] = v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return str(cookie.output(header='', sep=';').lstrip())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return cookie.output(header='', sep=';').lstrip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class ExecutionListener(object):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- callback=normalize_url)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @click.option('--env', help="Environment file to preload.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- type=click.Path(exists=True))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@click.argument('url', default='')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@click.argument('url', default='http://localhost:8000')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @click.argument('http_options', nargs=-1, type=click.UNPROCESSED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @click.version_option(message='%(version)s')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def cli(spec, env, url, http_options):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,8 +119,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- finally:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if url:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- url = fix_incomplete_url(url)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ url = fix_incomplete_url(url)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context = Context(url, spec=spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output_style = cfg.get('output_style')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +134,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +140,7 @@
</span> 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)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> listener = ExecutionListener(cfg)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,8 +144,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load_context(context, env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if url:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Overwrite the env url if not default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if url != 'http://localhost:8000':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # overwrite the env url if not default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context.url = url
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if http_options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +158,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,7 +164,9 @@
</span> text = prompt('%s> ' % context.url, completer=completer,
lexer=lexer, style=style, history=history,
auto_suggest=AutoSuggestFromHistory(),
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/http-prompt/files/patch-test_interaction.py.diff b/net/http-prompt/files/patch-test_interaction.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7dae897a090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/http-prompt/files/patch-test_interaction.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/test_interaction.py.orig 2021-03-05 17:17:16.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/test_interaction.py 2021-03-21 18:21:07.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin_path = get_http_prompt_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ child = pexpect.spawn(bin_path, env=os.environ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- child.expect_exact('http://localhost:8000> ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ child.expect_exact('http://localhost:8000>')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enter 'htpie', switch to command mode (ESC),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move two chars left (hh), and insert (i) a 't'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/http-prompt/files/patch-utils.py.diff b/net/http-prompt/files/patch-utils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 445bb8ba0bd..6f1d9f1e3d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/http-prompt/files/patch-utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/http-prompt/files/patch-utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- http_prompt/utils.py.orig 2019-03-11 10:36:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ http_prompt/utils.py 2019-03-11 10:36:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- http_prompt/utils.py.orig 2021-03-05 17:17:16.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ http_prompt/utils.py 2021-03-21 17:28:35.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span> import re
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import shlex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -from prompt_toolkit.shortcuts import create_output
+from prompt_toolkit.output.defaults import create_output
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from six.moves import range
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RE_ANSI_ESCAPE = re.compile(r'\x1b[^m]*m')
</span></pre><pre style='margin:0'>
</pre>