<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/6ae9e0517fd8e05aa708236bfc03774c04446f17">https://github.com/macports/macports-ports/commit/6ae9e0517fd8e05aa708236bfc03774c04446f17</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6ae9e0517fd8e05aa708236bfc03774c04446f17
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jan 30 19:48:48 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: fix PyLS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62186
</span>---
python/py-spyder/Portfile | 7 +++++--
python/py-spyder/files/patch-spyder_config_lsp.py.diff | 11 +++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e64a0abd1ab..fc65060bed5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup select 1.0
</span> github.setup spyder-ide spyder 4.2.1 v
github.tarball_from archive
name py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> # the epoch is here for historical reasons and cannot be removed
epoch 20111202
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +120,8 @@ if {${name} ne ${subport}} {
</span> patch-spyder_plugins_editor_plugin.py.diff \
patch-spyder_app_start.py.diff \
patch-spyder_app_utils.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_utils_programs.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_config_lsp.py.diff
</span>
set WINPDB_BIN_NAME winpdb-${python.branch}
set PYLS_BIN_NAME pyls-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,6 +139,8 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/spyder/app/utils.py
reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@WPYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/config/lsp.py
</span>
# temporary workaround for parso/jedi version restrictions
reinplace {s|PARSO_REQVER = '=0\.7\.0'|PARSO_REQVER = '>=0.7.0'|g} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_config_lsp.py.diff b/python/py-spyder/files/patch-spyder_config_lsp.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f3ba2f5ce1f
</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-spyder/files/patch-spyder_config_lsp.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;'>+--- spyder/config/lsp.py.orig 2021-01-30 19:46:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/lsp.py 2021-01-30 19:45:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default json config for the lsp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # =============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_CONFIG = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'cmd': 'pyls',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'cmd': 'PYLS_BIN_NAME',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'args': '--host {host} --port {port} --tcp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'host': '127.0.0.1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'port': 2087,
</span></pre><pre style='margin:0'>
</pre>