<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/2e049e01ec5596106c77670a053f40e009d8f1bc">https://github.com/macports/macports-ports/commit/2e049e01ec5596106c77670a053f40e009d8f1bc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2e049e0 py-spyder-devel: update to 34041c0 (20190928)
</span>2e049e0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e049e01ec5596106c77670a053f40e009d8f1bc
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Aug 9 08:18:59 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: update to 34041c0 (20190928)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add new pympler dependency
</span><span style='display:block; white-space:pre;color:#404040;'> - refresh patches
</span>---
python/py-spyder-devel/Portfile | 11 +--
.../files/patch-spyder_app_mainwindow.py.diff | 6 +-
.../files/patch-spyder_config_base.py.diff | 81 +++++++++++++---------
.../patch-spyder_plugins_editor_plugin.py.diff | 10 +--
.../files/patch-spyder_utils_programs.py.diff | 6 +-
5 files changed, 65 insertions(+), 49 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 c3d6ad0..a025509 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;'>@@ -7,8 +7,8 @@ PortGroup qt5 1.0
</span> PortGroup active_variants 1.1
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder f965187
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.0-20190718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 34041c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.0-20190928
</span> revision 0
name py-spyder-devel
# Preference on mailing list is to use small numbers for epoch.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,9 @@ long_description ${description}. \
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6f02c3a81ea5da13657d0aad829a742db464c22d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91096a9529c072d1be4baf562e36050aa9e619e3d942ea6e8c2015d4df228b90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9908245
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e5f023e7619316b784c64204dc4a68cc53354762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d7efa2e5e2dab4c233d721cc0e2042aa428bbe77183bde31930e28469e591319 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9976055
</span>
if {${name} ne ${subport}} {
require_active_variants py${python.version}-qtpy qt5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-psutil \
port:py${python.version}-pygments \
port:py${python.version}-pylint \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pympler \
</span> port:py${python.version}-pyqt5 \
port:py${python.version}-pyqt5-webengine \
port:py${python.version}-qdarkstyle \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5858caa..8da5e73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.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/mainwindow.py.orig 2019-04-25 13:26:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py 2019-04-27 11:21:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,7 +204,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,7 +208,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 77c528c..cf91a61 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,34 +1,49 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2019-02-24 18:54:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2019-02-24 19:03:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,10 +121,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # packagers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2019-08-12 13:40:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2019-08-12 13:43:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,23 +118,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #==============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_conf_subfolder():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Return the configuration subfolder for different ooperating systems."""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # packagers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if PY3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # packagers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if PY3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = SUBFOLDER + '-py3'
</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;'>++ # MacPorts: we allow multiple Python 2.x or 3.x versions side-by-side;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # keep preferences separate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.version_info[0], sys.version_info[1])
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,9 +132,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MacPorts: we allow multiple python 2.x or 3.x versions side-by-side; keep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# preferences separate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.version_info[0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.version_info[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If running a development/beta version, save config in a seperate directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to avoid wiping or contaiminating the user's saved stable configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If running a development/beta version, save config in a separate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # directory to avoid wiping or contaiminating the user's saved stable
</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 7ce356c..1ca3cbd 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,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor/plugin.py.orig 2019-04-25 13:26:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py 2019-04-27 11:21:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- required_version=NBCONVERT_REQVER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logger = logging.getLogger(__name__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
-WINPDB_PATH = programs.find_program('winpdb')
+WINPDB_PATH = programs.find_program('@@WINPDB_BIN_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 0c6b24d..1b067ef 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-02-24 13:42:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2019-02-24 19:09:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,6 +80,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
</pre><pre style='margin:0'>
</pre>