<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/6ef59930564153c5322e4207b796b6e91a67b9bd">https://github.com/macports/macports-ports/commit/6ef59930564153c5322e4207b796b6e91a67b9bd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6ef59930564153c5322e4207b796b6e91a67b9bd
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Mar 8 13:06:49 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-language-server: obsolete port
</span>---
 python/py-language-server/Portfile                 | 110 ++-------------------
 .../files/patch-pyls_plugins_flake8_lint.py.diff   |  20 ----
 .../files/patch-test_plugins_flake8_lint.py.diff   |  11 ---
 python/py-language-server/files/py27-pyls          |   1 -
 python/py-language-server/files/py35-pyls          |   1 -
 python/py-language-server/files/py36-pyls          |   1 -
 python/py-language-server/files/py37-pyls          |   1 -
 python/py-language-server/files/py38-pyls          |   1 -
 python/py-language-server/files/py39-pyls          |   1 -
 9 files changed, 10 insertions(+), 137 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 926124b6ac6..bcaae123259 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;'>@@ -1,110 +1,20 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           select 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           deprecated 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# palantir/python-language-server is unmaintained and has been forked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to python-lsp/python-lsp-server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-deprecated.upstream_support no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           obsolete 1.0
</span> 
 name                py-language-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        palantir python-language-server 0.36.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${version} eq "0.36.2" && ${subport} eq "py35-language-server"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    incr revision
</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;'>-# stealth update, remove when updating to new version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir          ${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by         py-python-lsp-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.36.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append   devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs     noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories          python
</span> license             MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         {reneeotten @reneeotten} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description         An implementation of the Language Server Protocol for Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description    ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  cf9f5be95659eff1c9a9fabbf136e0653a9258d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  fb573f780467c1cae0de47065eecbaaf9b457bd5cbe9f5cf8409224e1cd21cf6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    463591
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 35 36 37 38 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-autopep8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-codestyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-docstyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-flake8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-flake8-mccabe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-jedi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-pluggy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-python-jsonrpc-server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-rope \
</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}-ujson \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-yapf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append  port:py${python.version}-backports-functools_lru_cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-configparser \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-future
</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;'>-    patchfiles-append   patch-pyls_plugins_flake8_lint.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@FLAKE8_BIN@@|flake8-${python.branch}|g" ${worksrcpath}/pyls/plugins/flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@FLAKE8_BIN@@|flake8-${python.branch}|g" ${worksrcpath}/test/plugins/test_flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PYTHON_BIN@@|${python.bin}|g" ${worksrcpath}/pyls/plugins/flake8_lint.py
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # temporary reinplace to remove version cap on jedi, pyflakes, and pycodestyle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace {s|'jedi>=0\.17\.2,<0\.18\.0'|'jedi>=0\.17\.2,<0.19.0'|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace {s|'pyflakes>=2\.2\.0,<2\.3\.0'|'pyflakes>=2.2.0,<2.4.0'|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace {s|'pycodestyle>=2\.6\.0,<2\.7\.0'|'pycodestyle>=2.6.0,<2.8.0'|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv "37 38 39" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    subport "py${pv}-language-server" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        replaced_by     py${pv}-python-lsp-server
</span>     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_test-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-mock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-flaky
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.run        yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.cmd        py.test-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.args       -o addopts=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.env        PYTHONPATH=${worksrcpath}/build/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -m 0644 -W ${worksrcpath} README.rst LICENSE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${docdir}
</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;'>-    depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python-language-server_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    select.group    python-language-server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    select.file     ${filespath}/py${python.version}-pyls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To make the Python ${python.branch} version of python language server the one\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-that is run when you execute the commands without a version suffix, e.g.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-'pyls', run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-port select --set ${select.group} [file tail ${select.file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This port is deprecated. Please consider using py${python.version}-python-lsp-server instead.
</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;'>-    livecheck.type  none
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove after March 8, 2023
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c33e63294a6..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyls/plugins/flake8_lint.py.orig       2020-07-10 18:11:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyls/plugins/flake8_lint.py    2020-07-10 18:12:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         log.debug("using flake8 with config: %s", opts['config'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # Call the flake8 utility then parse diagnostics from stdout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    flake8_executable = settings.get('executable', 'flake8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    flake8_executable = settings.get('executable', '@@FLAKE8_BIN@@')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     args = build_args(opts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     output = run_flake8(flake8_executable, args, document)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     except IOError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        cmd = ['python', '-m', 'flake8']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        cmd = ['@@PYTHON_BIN@@', '-m', 'flake8']
</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, stdin=PIPE, stdout=PIPE, stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     (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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7e3fd317a3..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/plugins/test_flake8_lint.py.orig  2020-07-10 18:32:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/plugins/test_flake8_lint.py       2020-07-10 18:33:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         _name, doc = temp_document(DOC, workspace)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         flake8_lint.pyls_lint(workspace, doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         call_args = popen_mock.call_args.args[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        assert 'flake8' in call_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        assert '@@FLAKE8_BIN@@' in call_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         assert '--config={}'.format(flake8_conf) in call_args
</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;color:#808080;'>diff --git a/python/py-language-server/files/py27-pyls b/python/py-language-server/files/py27-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ef6c3f589fa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py27-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.7/bin/pyls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/py35-pyls b/python/py-language-server/files/py35-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 958472e8f2d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py35-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.5/bin/pyls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/py36-pyls b/python/py-language-server/files/py36-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d91b22a52b3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py36-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.6/bin/pyls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/py37-pyls b/python/py-language-server/files/py37-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3aa616b82c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py37-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.7/bin/pyls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/py38-pyls b/python/py-language-server/files/py38-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c7bdd25c59..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py38-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.8/bin/pyls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-language-server/files/py39-pyls b/python/py-language-server/files/py39-pyls
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 289ebf99b21..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-language-server/files/py39-pyls
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.9/bin/pyls
</span></pre><pre style='margin:0'>

</pre>