<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/610ec6362b0f1eac28d737abf8864389fa96459b">https://github.com/macports/macports-ports/commit/610ec6362b0f1eac28d737abf8864389fa96459b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 610ec6362b0f1eac28d737abf8864389fa96459b
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Nov 22 14:11:48 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-python-lsp-server: update to 1.3.1
</span>---
 python/py-python-lsp-server/Portfile               | 14 ++++----
 .../files/patch-pylsp_plugins_flake8_lint.py.diff  | 15 ++------
 .../py-python-lsp-server/files/patch-setup.py.diff | 40 ----------------------
 3 files changed, 9 insertions(+), 60 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-lsp-server/Portfile b/python/py-python-lsp-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f90f37a6576..bb6631c71a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-lsp-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-lsp-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,12 +6,11 @@ PortGroup           python 1.0
</span> PortGroup           select 1.0
 
 name                py-python-lsp-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        python-lsp python-lsp-server 1.2.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        python-lsp python-lsp-server 1.3.1 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> 
 categories-append   devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> supported_archs     noarch
 license             MIT
 maintainers         {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +19,9 @@ description         A Python implementation of the Language Server Protocol
</span> long_description    Fork of the python-language-server project, maintained by the Spyder \
                     IDE team and the community.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  1f0fbc839448dcd2d0aa9c47306f85b0d3cea5fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3e9102808f661df18a54e2ddd97285d4b3c4cbc0af6fed8439a1960617f74674 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    66838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5ada9ba1a392870082ee2f9214c7ae9b4b39fbdd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  5b239482e44313324037b0ca2d2720373c250d69d00e9c30988b0fb34656afee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    67632
</span> 
 python.versions     36 37 38 39
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +43,7 @@ if {${subport} ne ${name}} {
</span>                     port:py${python.version}-yapf
 
     patchfiles-append   patch-pylsp_plugins_flake8_lint.py.diff \
<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;'>-                        patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-test_plugins_flake8_lint.py.diff
</span> 
     post-patch {
         reinplace "s|@@FLAKE8_BIN@@|flake8-${python.branch}|g" ${worksrcpath}/pylsp/plugins/flake8_lint.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-lsp-server/files/patch-pylsp_plugins_flake8_lint.py.diff b/python/py-python-lsp-server/files/patch-pylsp_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c81fc452697..90a72b91476 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-lsp-server/files/patch-pylsp_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-lsp-server/files/patch-pylsp_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pylsp/plugins/flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pylsp/plugins/flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@ def pylsp_lint(workspace, document):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pylsp/plugins/flake8_lint.py.orig      2021-11-22 12:30:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pylsp/plugins/flake8_lint.py   2021-11-23 12:56:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span>          log.debug("using flake8 with config: %s", opts['config'])
  
      # Call the flake8 utility then parse diagnostics from stdout
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,3 @@
</span>  
      args = build_args(opts)
      output = run_flake8(flake8_executable, args, document)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +82,7 @@ def run_flake8(flake8_executable, args, document):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
</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)  # pylint: disable=consider-using-with
</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-python-lsp-server/files/patch-setup.py.diff b/python/py-python-lsp-server/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9aab015b373..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-lsp-server/files/patch-setup.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,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2021-11-18 09:00:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2021-11-18 09:01:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,26 +46,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     python_requires='>=3.6',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     extras_require={
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         'all': [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'autopep8',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'flake8>=3.8.0,<4.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'autopep8>=1.6.0,<1.7.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'flake8>=4.0.0,<4.1.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'mccabe>=0.6.0,<0.7.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'pycodestyle>=2.7.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'pycodestyle>=2.8.0,<2.9.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'pydocstyle>=2.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'pyflakes>=2.3.0,<2.4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'pylint>=2.5.0,<2.10.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'pyflakes>=2.4.0,<2.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'pylint>=2.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'rope>=0.10.5',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'yapf',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'autopep8': ['autopep8'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'flake8': ['flake8>=3.8.0,<4.0.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'autopep8': ['autopep8>=1.6.0,<1.7.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'flake8': ['flake8>=4.0.0,<4.1.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         'mccabe': ['mccabe>=0.6.0,<0.7.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'pycodestyle': ['pycodestyle>=2.7.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'pycodestyle': ['pycodestyle>=2.8.0,<2.9.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         'pydocstyle': ['pydocstyle>=2.0.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'pyflakes': ['pyflakes>=2.3.0,<2.4.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'pylint': ['pylint>=2.5.0,<2.10.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'pyflakes': ['pyflakes>=2.4.0,<2.5.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'pylint': ['pylint>=2.5.0'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         'rope': ['rope>0.10.5'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         'yapf': ['yapf'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        'test': ['pylint>=2.5.0,<2.10.0', 'pytest', 'pytest-cov', 'coverage',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        'test': ['pylint>=2.5.0', 'pytest', 'pytest-cov', 'coverage',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  'numpy', 'pandas', 'matplotlib', 'pyqt5', 'flaky'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     entry_points={
</span></pre><pre style='margin:0'>

</pre>