<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/c3906da80d243c0736e1d297610cabe53c9826fa">https://github.com/macports/macports-ports/commit/c3906da80d243c0736e1d297610cabe53c9826fa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c3906da80d243c0736e1d297610cabe53c9826fa
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Jun 30 15:34:00 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: update to 20210306-1660c13, add py39
</span>---
python/py-spyder-devel/Portfile | 47 +++++++++++++++-------
python/py-spyder-devel/files/patch-setup.py.diff | 24 +++++++++++
.../files/patch-spyder_app_utils.py.diff | 6 +--
.../files/patch-spyder_config_base.py.diff | 6 +--
.../files/patch-spyder_config_lsp.py.diff | 11 +++++
.../patch-spyder_plugins_editor_plugin.py.diff | 6 +--
.../files/patch-spyder_utils_programs.py.diff | 6 +--
python/py-spyder-devel/files/spyder-39 | 1 +
8 files changed, 80 insertions(+), 27 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 3ff68c05812..4046c328709 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,10 +6,10 @@ 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 833de4b928a5d2b28422d2c56a08e9217af6ad2a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 06562dd073d3473c24e658849a09ab6266af3426
</span> name py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20200508-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210223-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> # the epoch is here for historical reasons and cannot be removed
epoch 20161005
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,11 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 49e4af246aefd5700716a22c53d8a1bec577fddc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8190bb1a351ad39dda25d10c7ba507ce24fd37a480c1f51d77e0d562b6947690 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11611292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cf069489d95dcf0597112e93c1ee3d5f7821b173 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0ef0954e72308c3c3a33218b733470870c4d4b1d6514108b03b51c023c86e8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11613194
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38 39
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-spyder
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-atomicwrites \
port:py${python.version}-chardet \
port:py${python.version}-cloudpickle \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cookiecutter \
</span> port:py${python.version}-diff-match-patch \
port:py${python.version}-intervaltree \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-ipython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jsonschema \
</span> port:py${python.version}-keyring \
port:py${python.version}-language-server \
port:py${python.version}-nbconvert \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +57,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pexpect \
port:py${python.version}-pickleshare \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyls-black \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyls-spyder \
</span> port:py${python.version}-pygments \
port:py${python.version}-pylint \
port:py${python.version}-pyqt5 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,8 +67,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-qtawesome \
port:py${python.version}-qtconsole \
port:py${python.version}-qtpy \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span> port:py${python.version}-sphinx \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-spyder-kernels-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-spyder-kernels \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-textdistance \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-three-merge \
</span> port:py${python.version}-watchdog \
port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +103,9 @@ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-setup.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;'>@@ -113,14 +123,21 @@ 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|@@PYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/config/lsp.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # workaround for jedi, parso, and python-language-server version caps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|JEDI_REQVER = '=0\.15\.2'|JEDI_REQVER = '>=0.15.2'|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary workaround for parso/jedi version restrictions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|PARSO_REQVER = '=0\.7\.0'|PARSO_REQVER = '>=0.7.0'|g} \
</span> ${worksrcpath}/spyder/dependencies.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PARSO_REQVER = '=0\.5\.2'|PARSO_REQVER = '>=0.5.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|PYLS_REQVER = '>=0\.31\.9;<0\.32\.0'|PYLS_REQVER = '>=0.31.9;<0.34.0'|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|parso==0\.7\.0|parso>=0.7.0|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|JEDI_REQVER = '=0\.17\.2'|JEDI_REQVER = '>=0.17.2'|g} \
</span> ${worksrcpath}/spyder/dependencies.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|jedi==0\.17\.2|jedi>=0.17.2|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary workaround for spyder-kernels version restrictions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see: https://github.com/spyder-ide/spyder/commit/e85aa5fdd4e4236e9082c3908e942c3d5d2de5e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;background:#e0e0e0;'>@@ -131,7 +148,7 @@ if {${name} ne ${subport}} {
</span> xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} AUTHORS.txt Announcements.md \
CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md RELEASE.md \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- TROUBLESHOOTING.md ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NOTICE.txt ${destroot}${docdir}
</span> }
depends_run-append \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb914c15792
</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-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These dependencies are added in the Portfile. However, the py-pyqt5{-webengine} and py-pybojc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ports do not install an .egg-info file, so it appears that the package isn't present.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+file and allows spyder to start. This is likely something that should be fixed in these ports,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but for now just take the pragmatic approach in this -devel port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-03-06 18:58:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-03-06 19:00:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'applaunchservices>=0.1.7;platform_system=="Darwin"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'atomicwrites>=1.2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'chardet>=2.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'cloudpickle>=0.5.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,8 +221,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'psutil>=5.3',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pygments>=2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pylint>=1.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'pyqt5<5.13',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'pyqtwebengine<5.13',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-language-server[all]>=0.36.2,<1.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-black>=0.4.6',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-spyder>=0.3.2',
</span><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 e78ff8b3154..5fd016daee1 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 2020-03-13 14:50:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/utils.py 2020-03-13 14:50:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,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 cf91a6105bb..1c0e1619619 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 2019-08-12 13:40:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2019-08-12 13:43:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,23 +118,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,23 +126,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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65a3b4d6c07
</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-devel/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><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><span style='display:block; white-space:pre;color:#808080;'>index 5e2b68eb5a5..7f3b133e832 100644
</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;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.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/plugins/editor/plugin.py.orig 2020-03-31 21:03:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py 2020-04-01 14:25:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span> logger = logging.getLogger(__name__)
<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 1b067efca14..5896d1dccbc 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,6 +80,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2021-03-06 12:37:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2021-03-06 18:53:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-39 b/python/py-spyder-devel/files/spyder-39
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0755b6d7b8
</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-devel/files/spyder-39
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/spyder-3.9
</span></pre><pre style='margin:0'>
</pre>