<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/d243602d8fda06356dca42e5bb86703b5b85fac6">https://github.com/macports/macports-ports/commit/d243602d8fda06356dca42e5bb86703b5b85fac6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d243602d8fda06356dca42e5bb86703b5b85fac6
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Dec 10 22:57:15 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 4.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - pin to version 4.1.6 for py27/py35 subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61952
</span>---
python/py-spyder/Portfile | 42 +++++++++++++++++-----
.../py-spyder/files/patch-spyder_app_utils.py.diff | 6 ++--
.../files/patch-spyder_config_base.py.diff | 6 ++--
.../files/patch-spyder_utils_programs.py.diff | 6 ++--
python/py-spyder/files/spyder-34 | 1 -
5 files changed, 42 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2f97cc3aea..e64a0abd1ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +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 4.1.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 4.2.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> name py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</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 20111202
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +31,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 242636922d9c864fbc7c4095b8b39f32dd593cf8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 233c82c6f17f85eb82b8341607c39b60731e14969558d58e7597772357cc45a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11699349
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 807f5b8b4f247fb171194489fd01ab5a3c407710 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0231a3b0ba0530817e53b5162ce0c3db8c98f071a0e4d4b6027721bf32039e2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12156626
</span>
python.versions 27 35 36 37 38
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +49,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-cloudpickle \
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;'>@@ -55,6 +58,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;'>@@ -63,11 +68,30 @@ 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 \
port:py${python.version}-spyder-kernels \
<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:#e0ffe0;'>+ if {${python.version} in "27 35"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup spyder-ide spyder 4.1.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 807f5b8b4f247fb171194489fd01ab5a3c407710 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0231a3b0ba0530817e53b5162ce0c3db8c98f071a0e4d4b6027721bf32039e2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12156626
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jsonschema \
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant small description "Remove all optional dependencies." {}
if {![ variant_isset small ]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,11 +139,11 @@ if {${name} ne ${subport}} {
</span> reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary workaround for jedi and parso version restrictions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|JEDI_REQVER = '=0\.17\.1'|JEDI_REQVER = '>=0.17.1'|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/dependencies.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary workaround for parso/jedi version restrictions
</span> reinplace {s|PARSO_REQVER = '=0\.7\.0'|PARSO_REQVER = '>=0.7.0'|g} \
${worksrcpath}/spyder/dependencies.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|JEDI_REQVER = '=0\.17\.2'|JEDI_REQVER = '>=0.17.2'|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/dependencies.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +154,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;'>+ ${destroot}${docdir}
</span> }
depends_run-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_utils.py.diff b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 01eb48829f7..8c047300374 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/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-16 21:57:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/utils.py 2020-03-16 21:59:08.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 2020-11-08 16:56:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2020-12-11 23:26:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,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/files/patch-spyder_config_base.py.diff b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cf91a6105bb..6e21dc29cce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/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 2020-11-08 16:56:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2020-12-11 23:26:53.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/files/patch-spyder_utils_programs.py.diff b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b067efca14..4d68a0f4eb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/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 2020-11-08 16:56:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2020-12-11 23:26:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,6 +118,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/files/spyder-34 b/python/py-spyder/files/spyder-34
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1fa33937668..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyder-34
</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;'>-bin/spyder-3.4
</span></pre><pre style='margin:0'>
</pre>