<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/ee612d947a145ff1d6203eab001d70899a0a7601">https://github.com/macports/macports-ports/commit/ee612d947a145ff1d6203eab001d70899a0a7601</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ee612d947a145ff1d6203eab001d70899a0a7601
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Aug 13 12:34:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: update to 20210813-bbd9b1fb
</span>---
python/py-spyder-devel/Portfile | 37 ++++------------------
python/py-spyder-devel/files/patch-setup.py.diff | 12 +++----
.../files/patch-spyder_app_utils.py.diff | 6 ++--
.../files/patch-spyder_config_base.py.diff | 6 ++--
.../files/patch-spyder_config_lsp.py.diff | 6 ++--
.../patch-spyder_plugins_editor_plugin.py.diff | 11 -------
.../files/patch-spyder_utils_programs.py.diff | 4 +--
7 files changed, 24 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/Portfile b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4698a634550..2f29ba209e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@ PortGroup python 1.0
</span> PortGroup qt5 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 17335f31521846449fc49a64bb68cd1ec4b1ac17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder bbd9b1fb90470f85e599285449d1f18cc2d0e6e6
</span> name py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210604-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210813-[string range ${github.version} 0 7]
</span> revision 0
# the epoch is here for historical reasons and cannot be removed
epoch 20161005
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3ce9aa5e9abab2867597f0556b8ae1ec890cee3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 42771d5246e676495c86afb4f01a8c441095cdca574ff41f1d991f640ab12f14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20592690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f99ab5a5cd7cef06b4d52ae135764965a90e8bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 52407178df638cf04e6b51336baa7a5942018ade397f055ac9765b8899ef2441 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19781424
</span>
python.versions 36 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,18 +51,18 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-ipython \
port:py${python.version}-jsonschema \
port:py${python.version}-keyring \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-language-server \
</span> port:py${python.version}-nbconvert \
port:py${python.version}-numpydoc \
port:py${python.version}-pexpect \
port:py${python.version}-pickleshare \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyls-black \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-python-lsp-black \
</span> port:py${python.version}-pyls-spyder \
port:py${python.version}-pygments \
port:py${python.version}-pylint \
port:py${python.version}-pyqt5 \
port:py${python.version}-pyqt5-webengine \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-python-lsp-server \
</span> port:py${python.version}-qdarkstyle \
port:py${python.version}-qstylizer \
port:py${python.version}-qtawesome \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,44 +102,21 @@ if {${name} ne ${subport}} {
</span>
patchfiles-append \
patch-spyder_config_base.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_plugins_editor_plugin.py.diff \
</span> patch-spyder_app_start.py.diff \
patch-spyder_app_utils.py.diff \
patch-spyder_utils_programs.py.diff \
patch-spyder_config_lsp.py.diff \
patch-setup.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set WINPDB_BIN_NAME winpdb-${python.branch}
</span> set PYLS_BIN_NAME pyls-${python.branch}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/plugins/editor/plugin.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"designer\"|\"Designer\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/app/mainwindow.py
</span> reinplace "s|@@PREFIX@@|${prefix}|g" \
${worksrcpath}/spyder/app/utils.py
reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
reinplace "s|@@PYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
${worksrcpath}/spyder/config/lsp.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary workaround for parso/jedi version restrictions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PARSO_REQVER = '=0\.7\.0'|PARSO_REQVER = '>=0.7.0'|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/dependencies.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|parso==0\.7\.0|parso>=0.7.0|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|JEDI_REQVER = '=0\.17\.2'|JEDI_REQVER = '>=0.17.2'|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/dependencies.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|jedi==0\.17\.2|jedi>=0.17.2|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary workaround for spyder-kernels version restrictions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see: https://github.com/spyder-ide/spyder/commit/e85aa5fdd4e4236e9082c3908e942c3d5d2de5e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|spyder-kernels>=1\.10\.2,<1\.11\.0|spyder-kernels>=>=2.0.0dev0|g} ${worksrcpath}/setup.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-setup.py.diff b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a7114a6d76..ea8ee89e5e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ ports do not install an .egg-info file, so it appears that the package isn't pre
</span> Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
file and allows spyder to start. This is likely something that should be fixed in these ports,
but for now just take the pragmatic approach.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-05-11 22:36:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-08-05 08:44:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-08-05 08:44:28.000000000 -0400
</span> @@ -201,7 +201,6 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,11 @@ but for now just take the pragmatic approach.
</span> 'chardet>=2.0.0',
'cloudpickle>=0.5.0',
@@ -224,8 +223,6 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=1.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyls-black>=0.4.6',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyls-spyder>=0.3.2,<0.4.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pylint>=2.5.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-black>=1.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-spyder>=0.4.0',
</span> - 'pyqt5<5.13',
- 'pyqtwebengine<5.13',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-language-server[all]>=0.36.2,<1.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-server[all]>=1.2.1,<1.3.0',
</span> 'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=17',
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_utils.py.diff b/python/py-spyder-devel/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fd016daee1..9526feee42f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_utils.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;'>---- spyder/app/utils.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/utils.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2021-05-12 21:51:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span> return file_uri(osp.join(doc_path, python_chm[0]))
else:
vinf = sys.version_info
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_config_base.py.diff b/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c0e1619619..ea020369bb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_config_base.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;'>---- spyder/config/base.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,23 +126,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2021-05-12 21:15:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,23 +125,29 @@
</span> #==============================================================================
def get_conf_subfolder():
"""Return the configuration subfolder for different ooperating systems."""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_config_lsp.py.diff b/python/py-spyder-devel/files/patch-spyder_config_lsp.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 65a3b4d6c07..1bb3d614070 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_config_lsp.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_config_lsp.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/lsp.py.orig 2021-01-30 19:46:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/lsp.py 2021-01-30 19:45:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/lsp.py.orig 2021-08-05 07:45:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/lsp.py 2021-08-05 07:46:19.000000000 -0400
</span> @@ -21,7 +21,7 @@
# Default json config for the lsp
# =============================================================================
PYTHON_CONFIG = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'cmd': 'pyls',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'cmd': 'pylsp',
</span> + 'cmd': '@@PYLS_BIN_NAME@@',
'args': '--host {host} --port {port} --tcp',
'host': '127.0.0.1',
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f3b133e832..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.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;'>---- spyder/plugins/editor/plugin.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- logger = logging.getLogger(__name__)
</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;'>--WINPDB_PATH = programs.find_program('winpdb')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+WINPDB_PATH = programs.find_program('@@WINPDB_BIN_NAME@@')
</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;'>- class Editor(SpyderPluginWidget):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5896d1dccbc..1b7d30a7419 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2021-05-12 21:52:22.000000000 -0400
</span> @@ -123,6 +123,11 @@
abspath = osp.join(path, basename)
if osp.isfile(abspath):
</pre><pre style='margin:0'>
</pre>