<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c25f8bdf789d99d82547597987b02ff6e840eb9">https://github.com/macports/macports-ports/commit/1c25f8bdf789d99d82547597987b02ff6e840eb9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c25f8bdf789d99d82547597987b02ff6e840eb9
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Jul 10 18:09:22 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-language-server: update to 0.34.1
</span>---
python/py-language-server/Portfile | 8 +++---
.../files/patch-pyls_plugins_flake8_lint.py.diff | 29 ++++++++++++----------
.../files/patch-test_plugins_flake8_lint.py.diff | 12 +++++----
3 files changed, 27 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/Portfile b/python/py-language-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f41bcdec8f..6f8bd9d91f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span> PortGroup select 1.0
name py-language-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup palantir python-language-server 0.33.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup palantir python-language-server 0.34.1
</span> revision 0
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ maintainers {reneeotten @reneeotten} openmaintainer
</span> description An implementation of the Language Server Protocol for Python
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bfabd91e2ce7d576db3d471bf44623afbc5dbdc7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b78fc667044a42758a8784ee9f2daf01722d6d7e1bf79fb65dc8728a47bc811c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 457462
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 58ac2d5e87f10a823fd40f7db3ec4286becf771a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05b5e24254e8c79ad8b02f8611a0ec8145e277944d17cd58f5aefe55d7c8b11b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 457974
</span>
python.versions 27 35 36 37 38
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/patch-pyls_plugins_flake8_lint.py.diff b/python/py-language-server/files/patch-pyls_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ba0d4016872..c33e63294a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/patch-pyls_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-language-server/files/patch-pyls_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyls/plugins/flake8_lint.py.orig 2019-11-18 09:36:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyls/plugins/flake8_lint.py 2019-11-18 09:38:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,12 +40,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log.debug("Calling flake8 with args: '%s'", args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cmd = ['flake8']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmd = ['@@FLAKE8_BIN@@']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd.extend(args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p = Popen(cmd, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyls/plugins/flake8_lint.py.orig 2020-07-10 18:11:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyls/plugins/flake8_lint.py 2020-07-10 18:12:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.debug("using flake8 with config: %s", opts['config'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Call the flake8 utility then parse diagnostics from stdout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flake8_executable = settings.get('executable', 'flake8')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flake8_executable = settings.get('executable', '@@FLAKE8_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = build_args(opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output = run_flake8(flake8_executable, args, document)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
</span> except IOError:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- log.debug("Can't execute flake8. Trying with 'python -m flake8'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
</span> - cmd = ['python', '-m', 'flake8']
+ cmd = ['@@PYTHON_BIN@@', '-m', 'flake8']
cmd.extend(args)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- p = Popen(cmd, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stderr = p.stderr.read().decode()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (stdout, stderr) = p.communicate(document.source.encode())
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/patch-test_plugins_flake8_lint.py.diff b/python/py-language-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e7162748f21..e7e3fd317a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-language-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/plugins/test_flake8_lint.py.orig 2020-02-05 19:06:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/plugins/test_flake8_lint.py 2020-02-05 19:06:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,5 +61,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _name, doc = temp_document(DOC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flake8_lint.pyls_lint(config, doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/plugins/test_flake8_lint.py.orig 2020-07-10 18:32:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/plugins/test_flake8_lint.py 2020-07-10 18:33:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _name, doc = temp_document(DOC, workspace)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flake8_lint.pyls_lint(workspace, doc)
</span> call_args = popen_mock.call_args.args[0]
- assert 'flake8' in call_args
+ assert '@@FLAKE8_BIN@@' in call_args
assert '--config={}'.format(flake8_conf) in call_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>