<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/878cec55e32d86c18da350be0f7a8a7560359806">https://github.com/macports/macports-ports/commit/878cec55e32d86c18da350be0f7a8a7560359806</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 878cec55e32d86c18da350be0f7a8a7560359806
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Mar 16 13:47:23 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 4.1.0
</span>---
python/py-spyder/Portfile | 16 +++++++++-------
...ndow.py.diff => patch-spyder_app_utils.py.diff} | 22 +++++++++++-----------
.../patch-spyder_plugins_editor_plugin.py.diff | 6 +++---
3 files changed, 23 insertions(+), 21 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 8285185..d69ccef 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,7 +6,7 @@ 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.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 4.1.0 v
</span> name py-spyder
revision 0
# the epoch is here for historical reasons and cannot be removed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +30,16 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 132173be40f7a0c19d00e0528b1734a1b11c5cda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c86ffbd2175a6cfbb221947846e7fc8725372f833af3b49736fcdf7ea62fbb2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10786691
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 53869187004d78c30bc83b2a9ccfa9d56ba045b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e96363947a38cb2c57b9652e6972b4d9586f77ec6d7b9e4403141f5fab9dda1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11135167
</span>
python.versions 27 35 36 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-spyder-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} in "36 37"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-spyder-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
depends_lib-append \
port:py${python.version}-applaunchservices \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +95,7 @@ if {${name} ne ${subport}} {
</span> patch-spyder_config_base.py.diff \
patch-spyder_plugins_editor_plugin.py.diff \
patch-spyder_app_start.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_app_mainwindow.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_app_utils.py.diff \
</span> patch-spyder_utils_programs.py.diff
set WINPDB_BIN_NAME winpdb-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +111,7 @@ if {${name} ne ${subport}} {
</span> reinplace "s|\"designer\"|\"Designer\"|g" \
${worksrcpath}/spyder/app/mainwindow.py
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/app/utils.py
</span> reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_mainwindow.py.diff b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span>similarity index 55%
rename from python/py-spyder/files/patch-spyder_app_mainwindow.py.diff
rename to python/py-spyder/files/patch-spyder_app_utils.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8da5e73..01eb488 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_mainwindow.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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/mainwindow.py.orig 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return file_uri(osp.join(doc_path, python_chm[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vinf = sys.version_info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ doc_path = '@@PREFIX@@/share/doc/python%d%d-doc' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_doc = osp.join(doc_path, "index.html")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if osp.isfile(python_doc):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return file_uri(python_doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig 2020-03-16 21:57:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2020-03-16 21:59:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return file_uri(osp.join(doc_path, python_chm[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vinf = sys.version_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ doc_path = '@@PREFIX@@/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_doc = osp.join(doc_path, "index.html")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if osp.isfile(python_doc):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return file_uri(python_doc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_plugins_editor_plugin.py.diff b/python/py-spyder/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ca3cbd..d060101 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/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 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig 2020-03-15 23:44:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py 2020-03-16 21:53:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span> logger = logging.getLogger(__name__)
</pre><pre style='margin:0'>
</pre>