<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/0fae8f91b25cf152130c59f9dc99acb479bbdf4d">https://github.com/macports/macports-ports/commit/0fae8f91b25cf152130c59f9dc99acb479bbdf4d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0fae8f91b25cf152130c59f9dc99acb479bbdf4d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Nov 18 09:32:07 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-language-server: update to 0.31.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to use flake8 plugin with correct Python version
</span>---
python/py-language-server/Portfile | 16 ++++++++++++----
.../files/patch-pyls_plugins_flake8_lint.py.diff | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 4 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 18cdf7c4..c04fa57 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.30.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup palantir python-language-server 0.31.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 b3261256f6266c551ed37c7991e6f1385f6ba86a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b70828cdc53a345b9963f281b66d15e7b8fb06baca99ccd9ee8313094f4ecf0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 451222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0db9dad34f98bd2e725f3cf61c882847de58de87 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 27d3f14b41fa04cb5be197d0d284abc35477434eb8efe657d251ecb9311346cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 453417
</span>
# no support yet for Python 3.8
python.versions 27 35 36 37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ if {${subport} ne ${name}} {
</span> port:py${python.version}-python-jsonrpc-server \
port:py${python.version}-rope \
port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-ujson \
</span> port:py${python.version}-yapf
if {${python.version} eq 27} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +48,13 @@ if {${subport} ne ${name}} {
</span> port:py${python.version}-future
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pyls_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@FLAKE8_BIN@@|flake8-${python.branch}|g" ${worksrcpath}/pyls/plugins/flake8_lint.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON_BIN@@|${python.bin}|g" ${worksrcpath}/pyls/plugins/flake8_lint.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append \
port:py${python.version}-pytest \
port:py${python.version}-mock
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ba0d401
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyls/plugins/flake8_lint.py.orig 2019-11-18 09:36:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyls/plugins/flake8_lint.py 2019-11-18 09:38:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,12 +40,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.debug("Calling flake8 with args: '%s'", args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cmd = ['flake8']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmd = ['@@FLAKE8_BIN@@']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd.extend(args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = Popen(cmd, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except IOError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.debug("Can't execute flake8. Trying with 'python -m flake8'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cmd = ['python', '-m', 'flake8']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmd = ['@@PYTHON_BIN@@', '-m', 'flake8']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd.extend(args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = Popen(cmd, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stderr = p.stderr.read().decode()
</span></pre><pre style='margin:0'>
</pre>