<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/994c780a6494f2c58b82f852d9c82304a4661738">https://github.com/macports/macports-ports/commit/994c780a6494f2c58b82f852d9c82304a4661738</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 994c780a6494f2c58b82f852d9c82304a4661738
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jan 28 15:19:33 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-python-lsp-server: update to 1.7.1
</span>---
python/py-python-lsp-server/Portfile | 10 +++---
.../files/patch-dep-caps-pyproject.toml.diff | 41 ++++++++++------------
.../files/patch-pylsp_plugins_flake8_lint.py.diff | 18 +++++-----
.../files/patch-test_plugins_flake8_lint.py.diff | 20 -----------
4 files changed, 32 insertions(+), 57 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 0b00310f9e1..02c98061a57 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;'>@@ -5,8 +5,8 @@ PortGroup python 1.0
</span> PortGroup select 1.0
name py-python-lsp-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories-append devel
platforms {darwin any}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,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 51e06c75e6b8bdceb78efa4f3e1b9cc83c6238ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 85242
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 83a436f5228cb162412dfc5426b51db57d82697c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 95731
</span>
homepage https://github.com/python-lsp/python-lsp-server/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-lsp-server/files/patch-dep-caps-pyproject.toml.diff b/python/py-python-lsp-server/files/patch-dep-caps-pyproject.toml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 11e6cbca0a5..6a929ec7422 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-lsp-server/files/patch-dep-caps-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-lsp-server/files/patch-dep-caps-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +1,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml.orig 2022-12-26 03:45:21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml 2022-12-26 03:46:01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,23 +27,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig 2023-02-02 22:07:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2023-02-02 22:09:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,22 +27,22 @@
</span>
[project.optional-dependencies]
all = [
- "autopep8>=1.6.0,<1.7.0",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "flake8>=5.0.0,<5.1.0",
</span> + "autopep8>=1.6.0",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "flake8>=5.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "flake8>=5.0.0,<7",
</span> "mccabe>=0.7.0,<0.8.0",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "pycodestyle>=2.9.0,<2.10.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pycodestyle>=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.5.0,<2.6.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pyflakes>=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:#e0ffe0;'>+ "pycodestyle>=2.9.0,<2.11.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "pydocstyle>=6.2.0,<6.3.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pydocstyle>=6.2.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pyflakes>=2.5.0,<3.1.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pylint>=2.5.0,<3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "rope>1.2.0",
</span> "yapf",
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "whatthepatch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "whatthepatch>=1.0.2,<2.0.0"
</span> ]
-autopep8 = ["autopep8>=1.6.0,<1.7.0"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>--flake8 = ["flake8>=5.0.0,<5.1.0"]
</span> +autopep8 = ["autopep8>=1.6.0"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+flake8 = ["flake8>=5.0.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flake8 = ["flake8>=5.0.0,<7"]
</span> mccabe = ["mccabe>=0.7.0,<0.8.0"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>--pycodestyle = ["pycodestyle>=2.9.0,<2.10.0"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pycodestyle = ["pycodestyle>=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.5.0,<2.6.0"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pyflakes = ["pyflakes>=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", "whatthepatch>=1.0.2,<2.0.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pydocstyle = ["pydocstyle>=6.2.0,<6.3.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pydocstyle = ["pydocstyle>=6.2.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyflakes = ["pyflakes>=2.5.0,<3.1.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pylint = ["pylint>=2.5.0,<3"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rope = ["rope>1.2.0"]
</span><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 ed4f88eb05f..e21861db514 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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pylsp/plugins/flake8_lint.py.orig 2022-03-11 10:08:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pylsp/plugins/flake8_lint.py 2022-03-15 10:47:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,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:#e0ffe0;'>+--- pylsp/plugins/flake8_lint.py.orig 2023-02-02 22:00:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pylsp/plugins/flake8_lint.py 2023-02-02 22:01:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,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:#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:#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:#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:#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;color:#808080;'>diff --git a/python/py-python-lsp-server/files/patch-test_plugins_flake8_lint.py.diff b/python/py-python-lsp-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e5aa4bcf532..e69de29bb2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-lsp-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-lsp-server/files/patch-test_plugins_flake8_lint.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/plugins/test_flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/plugins/test_flake8_lint.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@ def test_flake8_config_param(workspace):
</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.pylsp_lint(workspace, doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (call_args,) = popen_mock.call_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;background:#ffe0e0;'>-@@ -126,7 +126,7 @@ exclude =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flake8_lint.pylsp_lint(workspace, doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call_args = popen_mock.call_args[0][0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert call_args == ["flake8", "-", "--exclude=blah/,file_2.py"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert call_args == ["@@FLAKE8_BIN@@", "-", "--exclude=blah/,file_2.py"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.unlink(os.path.join(workspace.root_path, "setup.cfg"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>