<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/93191134dfa6dff2c9beb2a6a9e21a22e22a7374">https://github.com/macports/macports-ports/commit/93191134dfa6dff2c9beb2a6a9e21a22e22a7374</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 93191134dfa6dff2c9beb2a6a9e21a22e22a7374
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Dec 14 19:09:28 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 4.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add temporary reinplace as workaround for jedi restriction
</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/59934
</span>---
python/py-spyder/Portfile | 66 ++++++++--------
.../files/patch-spyder_app_mainwindow.py.diff | 6 +-
.../py-spyder/files/patch-spyder_app_start.py.diff | 6 +-
.../files/patch-spyder_config_base.py.diff | 87 ++++++++++++----------
.../files/patch-spyder_plugins_editor.py.diff | 11 ---
.../patch-spyder_plugins_editor_plugin.py.diff | 11 +++
.../files/patch-spyder_utils_programs.py.diff | 6 +-
.../patch-spyder_utils_syntaxhighlighters.py.diff | 6 +-
8 files changed, 101 insertions(+), 98 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 39adedf..5ce89cd 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;'>@@ -4,14 +4,12 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 3.3.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 4.0.1 v
</span> name py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Preference on mailing list is to use small numbers for epoch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is already a date code, so sticking with dates.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the epoch is here for historical reasons and cannot be removed
</span> epoch 20111202
python.versions 27 35 36 37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +18,7 @@ categories-append devel
</span> platforms darwin
maintainers {reneeotten @reneeotten} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://packages.python.org/spyder/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.spyder-ide.org/
</span> description Spyder is the Scientific PYthon Development EnviRonment
long_description ${description}. \
Spyder provides a powerful interactive development \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +34,9 @@ long_description ${description}. \
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 848f5fc7ee8d1bc5dc1d4cf749d531aeb9ec89e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e95c6342324608a746c9a7cad7678b583a3c90e734706b6b5028efba21b6229 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3949802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 132173be40f7a0c19d00e0528b1734a1b11c5cda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c86ffbd2175a6cfbb221947846e7fc8725372f833af3b49736fcdf7ea62fbb2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10786691
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-spyder-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,49 +45,46 @@ if {${name} ne ${subport}} {
</span> port:spyder_select
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-applaunchservices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-atomicwrites \
</span> port:py${python.version}-chardet \
port:py${python.version}-cloudpickle \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-codestyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jedi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-diff-match-patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-intervaltree \
</span> port:py${python.version}-keyring \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-language-server \
</span> port:py${python.version}-nbconvert \
port:py${python.version}-numpydoc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pexpect \
</span> port:py${python.version}-pickleshare \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyflakes \
</span> 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}-qdarkstyle \
</span> port:py${python.version}-qtawesome \
port:py${python.version}-qtconsole \
port:py${python.version}-qtpy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-rope \
</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}-watchdog \
</span> port:py${python.version}-zmq
variant small description "Remove all optional dependencies." {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant webkit description "Use QtWebKit; only recommended for systems that do not support QtWebEngine" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-webengine \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants py${python.version}-pyqt5 webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
patchfiles-append patch-spyder_utils_syntaxhighlighters.py.diff
}
if {![ variant_isset small ]} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython \
</span> port:py${python.version}-matplotlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-scipy \
</span> port:py${python.version}-numpy \
port:py${python.version}-pandas \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sympy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sympy
</span> }
variant docs description "Include offline Python and Qt documentation." {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,20 +97,17 @@ if {${name} ne ${subport}} {
</span> path:${python.pkgd}/PIL:py${python.version}-Pillow
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set WINPDB_BIN_NAME winpdb-${python.branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYLS_BIN_NAME pyls-${python.branch}
</span> patchfiles-append patch-spyder_config_base.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_plugin.py.diff \
</span> patch-spyder_app_start.py.diff \
patch-spyder_app_mainwindow.py.diff \
patch-spyder_utils_programs.py.diff
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor/plugin.py
</span> reinplace "s|\"assistant\"|\"Assistant\"|g" \
${worksrcpath}/spyder/app/mainwindow.py
reinplace "s|\"linguist\"|\"Linguist\"|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,6 +118,10 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/spyder/app/mainwindow.py
reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary workaround for jedi restriction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|JEDI_REQVER = '=0.14.1'|JEDI_REQVER = '>=0.14.1'|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;'>@@ -135,22 +131,22 @@ if {${name} ne ${subport}} {
</span>
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} AUTHORS.txt Announcements.md LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHANGELOG.md CONTRIBUTING.md README.md RELEASE.md TROUBLESHOOTING.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS.txt Announcements.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md RELEASE.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TROUBLESHOOTING.md ${destroot}${docdir}
</span> }
select.group spyder
select.file ${filespath}/spyder-${python.version}
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-To make the Python ${python.branch} version of spyder the one that is run \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To make the Python ${python.branch} version of spyder the one that is run\
</span> when you execute the commands without a version suffix, e.g. 'spyder', run:
sudo port select --set ${select.group} [file tail ${select.file}]
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.livecheck.regex (3\\.\\d+\.\\d+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex {([0-9.]+)}
</span> }
<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_mainwindow.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 43e3db7..8da5e73 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_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-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,7 +212,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/files/patch-spyder_app_start.py.diff b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fd6c97..42c3808 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_app_start.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/start.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/start.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,9 @@
</span> except:
pass
<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 1776aa8..cf91a61 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,42 +1,49 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import tempfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Local imports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from spyder import __version__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.utils import encoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to_text_string, is_text_string)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,10 +86,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:#ffe0e0;'>-
</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;'>-@@ -96,8 +97,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:#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:#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:#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;'>- def get_home_dir():
</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/files/patch-spyder_plugins_editor.py.diff b/python/py-spyder/files/patch-spyder_plugins_editor.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 923ca0f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_plugins_editor.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.py.orig 2018-05-19 22:55:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor.py 2018-05-19 22:55:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- save_breakpoints(filename, breakpoints)
</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 EditorConfigPage(PluginConfigPage):
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1ca3cbd
</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/files/patch-spyder_plugins_editor_plugin.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/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-WINPDB_PATH = programs.find_program('winpdb')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WINPDB_PATH = programs.find_program('@@WINPDB_BIN_NAME@@')
</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;'>+ class Editor(SpyderPluginWidget):
</span><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 a8532b0..1b067ef 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-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +63,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
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff b/python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 988e935..03c84c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.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/syntaxhighlighters.py.orig 2018-05-19 22:47:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/syntaxhighlighters.py 2018-05-19 22:47:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,6 +191,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/syntaxhighlighters.py.orig 2018-09-07 10:34:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/syntaxhighlighters.py 2018-09-08 12:54:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,6 +196,10 @@
</span> if bold:
format.setFontWeight(QFont.Bold)
format.setFontItalic(italic)
</pre><pre style='margin:0'>
</pre>