<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02dbda93fd387382b6c0fd04fe276d2ba163b5cb">https://github.com/macports/macports-ports/commit/02dbda93fd387382b6c0fd04fe276d2ba163b5cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 02dbda93fd387382b6c0fd04fe276d2ba163b5cb
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sun May 20 13:26:07 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to version 3.2.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use the py-spyder-devel Portfile as starting point
</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/51375
</span><span style='display:block; white-space:pre;color:#404040;'> (updated v2.3.8 to latest released version)
</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/53084
</span><span style='display:block; white-space:pre;color:#404040;'> (seems fixed by upstream and/or patch-spyder_app_start.py.diff)
</span>---
python/py-spyder/Portfile | 221 ++++++++++-----------
python/py-spyder/files/ipython_checks.diff | 11 -
.../py-spyder/files/patch-scripts_spyder-qt4.diff | 8 +
.../py-spyder/files/patch-scripts_spyder3-qt4.diff | 8 +
...py.diff => patch-spyder_app_mainwindow.py.diff} | 10 +-
.../py-spyder/files/patch-spyder_app_start.py.diff | 12 ++
.../files/patch-spyder_config_base.py.diff | 42 ++++
.../files/patch-spyder_plugins_editor.py.diff | 11 +
.../files/patch-spyder_utils_programs.py.diff | 14 ++
... patch-spyder_utils_syntaxhighlighters.py.diff} | 8 +-
.../files/patch-widgets-pylintgui.py.diff | 19 --
python/py-spyder/files/spyder-27 | 1 +
python/py-spyder/files/spyder-34 | 1 +
python/py-spyder/files/spyder-35 | 1 +
python/py-spyder/files/spyder-36 | 1 +
.../py-spyder/files/spyderlib_baseconfig.py.diff | 13 --
.../files/spyderlib_plugins_editor.py.diff | 11 -
python/py-spyder/files/spyderlib_start_app.py.diff | 12 --
.../files/spyderlib_utils_programs.py.diff | 25 ---
.../files/spyderlib_widgets_shell.py.diff | 35 ----
20 files changed, 215 insertions(+), 249 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 feb5f86..47dd0ad 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;'>@@ -3,21 +3,20 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup select 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 2.3.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 3.2.8 v
</span> name py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> # Preference on mailing list is to use small numbers for epoch.
# This is already a date code, so sticking with dates.
epoch 20111202
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions 27 34 35 36
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span> categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {eborisch @eborisch} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:ottenr.work @reneeotten} {eborisch @eborisch} openmaintainer
</span> license MIT
homepage https://packages.python.org/spyder/
description Spyder is the Scientific PYthon Development EnviRonment
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,141 +35,135 @@ long_description ${description}. \
</span> supported_archs noarch
#pyNN-scipy doesn't build universal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e230ce207106cf50fe83aebae46eb635ebb69baa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6d1962aa5cac21a499e4d5fbea40a872f2b30517f7134af7d3b6be4f75ad8319
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-spyder-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the pylint executable name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set LINT_BIN_NAME pylint-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-widgets-pylintgui.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spyderlib_baseconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spyderlib_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spyderlib_start_app.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spyderlib_spyder.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spyderlib_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a698ca83df7b795b0cee61406eb112e1256b639e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 508e473c64fec5197761d368a5dbfafd187b38e8e668df8bb2e1430b3b3eb61f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4913127
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LINT_BIN_NAME@@|${LINT_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderplugins/widgets/pylintgui.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/spyder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/spyder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"designer\"|\"Designer\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/spyder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/spyder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@APPS_DIR@@|${applications_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/utils/programs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|Ctrl\+I|Cmd+I|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyderlib/plugins/inspector.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Windows newlines in the file cause compile() (in 2.6) to choke
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\r||g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/conf.py
</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;'>- # Bare minimum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spyder_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cloudpickle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-codestyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jedi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpydoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pickleshare \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pygments \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtawesome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtconsole \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-rope \
</span> port:py${python.version}-sphinx \
port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:GraphicsMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant tiny description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Remove all optional dependencies for quickest install. Dependencies\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- are detected/enabled at runtime and may be installed separately.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } conflicts small {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant small description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Remove most optional dependencies for quicker install. Dependencies\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- are detected/enabled at runtime and may be installed separately.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } conflicts tiny {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant no_anti_alias description {Use non-anti-aliased fonts in editor.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append no_AA.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant pyqt5 conflicts pyqt4 description "Qt backend using PyQt5" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants py${python.version}-pyqt5 webengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants py${python.version}-qtpy qt5
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant optimized description {Create .pyo files. Fails on BuildBot.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant pyqt4 conflicts pyqt5 description "Qt backend using PyQt4" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants py${python.version}-qtpy "" qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure that py-pyqt4 is used when also py-pyqt5 is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-scripts_spyder-qt4.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scripts_spyder3-qt4.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These add very little to the install time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![ variant_isset tiny ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-htmldocs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${python.pkgd}/pep8:py${python.version}-pep8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-rope \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-psutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +pyqt5
</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;'>+ variant small description "Remove all optional dependencies." {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-spyder_utils_syntaxhighlighters.py.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These add substantially to the install time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![ variant_isset small ] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![ variant_isset tiny ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![ variant_isset small ]} {
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qtconsole \
</span> port:py${python.version}-matplotlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-scipy
</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}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pandas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sympy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython
</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;'>+ variant docs description "Include offline Python and Qt documentation." {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-htmldocs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[ variant_isset pyqt5 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant pil description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Support image objects in editor through PIL or Pillow (many dependencies.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant pil description "Support image objects in editor through PIL or Pillow." {
</span> depends_lib-append \
path:${python.pkgd}/PIL:py${python.version}-Pillow
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-spyder_config_base.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_app_start.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_app_mainwindow.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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"designer\"|\"Designer\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == ${python.default_version}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.prefix}/bin/spyder ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "find . -name *.png -print0 | xargs -0 gm mogrify -strip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset optimized]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set OPTCMD [concat "HOME=${destroot}/tmp/spyder " \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHONPATH=${destroot}${python.pkgd} " \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "./spyder --optimize"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}/tmp/spyder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}/tmp/spyder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span> delete \
${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
delete ${destroot}${python.prefix}/bin/spyder_win_post_install.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == ${python.default_version}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set EXENAME "'spyder' "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set EXENAME "'spyder-${python.branch}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS Announcements.md LICENSE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG.md CONTRIBUTING.md README.md RELEASE.md TROUBLESHOOTING.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.group spyder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.file ${filespath}/spyder-${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+when you execute the commands without a version suffix, e.g. 'spyder', run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo port select --set ${select.group} [file tail ${select.file}]
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-##############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-### Spyder is launched from the terminal with ${EXENAME} ###
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-##############################################################"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Only match against 2.x series for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "archive/v(2\[^\"\]+).tar.gz"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/ipython_checks.diff b/python/py-spyder/files/ipython_checks.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38ce7c0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/ipython_checks.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;'>---- ./spyderlib/widgets/explorer.py.orig 2012-07-17 15:31:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./spyderlib/widgets/explorer.py 2012-07-17 15:30:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- triggered=lambda fnames=fnames:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.open_interpreter(fnames))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- actions.append(action)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if programs.is_module_installed('IPython', '0.10'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if programs.is_module_installed('IPython', '>=0.10'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _title = _("Open IPython here")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- action = create_action(self, _title, icon="ipython.png",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- triggered=lambda fnames=fnames:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-scripts_spyder-qt4.diff b/python/py-spyder/files/patch-scripts_spyder-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6a9face
</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-scripts_spyder-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/spyder.orig 2018-05-20 13:13:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/spyder 2018-05-20 13:13:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app import start
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-scripts_spyder3-qt4.diff b/python/py-spyder/files/patch-scripts_spyder3-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e954934
</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-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/spyder3.orig 2018-05-20 13:13:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/spyder3 2018-05-20 13:14:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #! /usr/bin/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app import start
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyderlib_spyder.py.diff b/python/py-spyder/files/patch-spyder_app_mainwindow.py.diff
</span>similarity index 51%
rename from python/py-spyder/files/spyderlib_spyder.py.diff
rename to python/py-spyder/files/patch-spyder_app_mainwindow.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index d88f6b4..2866342 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_spyder.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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/spyder.py.orig 2011-09-05 18:29:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/spyder.py 2011-09-08 08:36:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return osp.join(doc_path, python_chm[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig 2018-05-19 23:02:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py 2018-05-19 23:02:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return file_uri(osp.join(doc_path, python_chm[0]))
</span> else:
vinf = sys.version_info
- doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
+ doc_path = '@@PREFIX@@/share/doc/python%d%d-doc' % (vinf[0], vinf[1])
python_doc = osp.join(doc_path, "index.html")
if osp.isfile(python_doc):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 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_app_start.py.diff b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..87fbb05
</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_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig 2018-05-19 22:59:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py 2018-05-19 22:59:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.environ['LANG'] = 'en_US.UTF-8'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Local imports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.config.base import (get_conf_path, running_in_mac_app,
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2f0ab21
</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_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2018-05-19 22:50:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2018-05-19 22:51:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Local imports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from spyder import __version__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.utils import encoding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to_text_string, is_text_string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,10 +84,10 @@
</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;'>++##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;'>+
</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;'>+@@ -94,8 +95,14 @@
</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;'>++##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;'>++# MacPorts: we allow multiple python 2.x or 3.x versions side-by-side; keep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 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],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.version_info[1])
</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;'>+ def get_home_dir():
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..923ca0f
</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.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.py.orig 2018-05-19 22:55:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor.py 2018-05-19 22:55:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ save_breakpoints(filename, breakpoints)
</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 EditorConfigPage(PluginConfigPage):
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..907fc59
</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_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2018-05-19 23:42:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2018-05-19 23:42:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abspath = osp.join(path, basename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return abspath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abspath = "@@APPS_DIR@@/" + basename + ".app/Contents/MacOS/" + basename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return abspath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return None
</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;'>+ def find_program(basename):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/no_AA.diff b/python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span>similarity index 55%
rename from python/py-spyder/files/no_AA.diff
rename to python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 93294fc..988e935 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/no_AA.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;'>---- spyderlib/widgets/sourcecode/syntaxhighlighters.py.orig 2014-05-01 12:42:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/widgets/sourcecode/syntaxhighlighters.py 2014-05-01 12:43:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,6 +265,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/syntaxhighlighters.py.orig 2018-05-19 22:47:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/syntaxhighlighters.py 2018-05-19 22:47:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,6 +191,10 @@
</span> if bold:
format.setFontWeight(QFont.Bold)
format.setFontItalic(italic)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,4 +10,4 @@
</span> + format.setFont(font)
self.formats[name] = format
<span style='display:block; white-space:pre;background:#ffe0e0;'>- def _check_color_scheme(self, color_scheme):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def set_color_scheme(self, color_scheme):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-widgets-pylintgui.py.diff b/python/py-spyder/files/patch-widgets-pylintgui.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3200583..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-widgets-pylintgui.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,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderplugins/widgets/pylintgui.py.orig 2015-06-23 09:49:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderplugins/widgets/pylintgui.py 2015-06-23 09:49:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,14 +40,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ = get_translation("p_pylint", dirname="spyderplugins")
</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;'>--PYLINT = 'pylint'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if programs.find_program('pylint3'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYLINT = 'pylint3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif programs.find_program('python3-pylint'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYLINT = 'python3-pylint'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYLINT_PATH = programs.find_program(PYLINT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYLINT = '@@LINT_BIN_NAME@@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYLINT_PATH = programs.find_program('@@LINT_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;'>- def get_pylint_version():
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-27 b/python/py-spyder/files/spyder-27
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bf361f6
</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/spyder-27
</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-2.7
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1fa3393
</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/spyder-34
</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.4
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-35 b/python/py-spyder/files/spyder-35
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fc1e4ef
</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/spyder-35
</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.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-36 b/python/py-spyder/files/spyder-36
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..22b47ce
</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/spyder-36
</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.6
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyderlib_baseconfig.py.diff b/python/py-spyder/files/spyderlib_baseconfig.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e88c69..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_baseconfig.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,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/baseconfig.py.orig 2013-10-14 09:32:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/baseconfig.py 2013-10-14 09:35:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Configuration paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #==============================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if TEST is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = '.spyder%s' % __version__.split('.')[0]
</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;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBFOLDER = 'spyder_test'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyderlib_plugins_editor.py.diff b/python/py-spyder/files/spyderlib_plugins_editor.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index baf83ea..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_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;'>---- spyderlib/plugins/editor.py.orig 2011-10-12 11:11:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/plugins/editor.py 2011-10-12 11:12:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONF.set('run', '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/spyderlib_start_app.py.diff b/python/py-spyder/files/spyderlib_start_app.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f478892..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_start_app.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,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/start_app.py-orig 2013-10-14 12:43:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/start_app.py 2013-10-14 12:45:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import atexit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import random
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.environ['LANG'] = 'en_US.UTF-8'
</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 spyderlib.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyderlib.baseconfig import get_conf_path
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyderlib_utils_programs.py.diff b/python/py-spyder/files/spyderlib_utils_programs.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5896813..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_utils_programs.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,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/utils/programs.py.orig 2013-10-14 10:55:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/utils/programs.py 2013-10-14 10:55:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.name == 'nt':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEMPDIR = tempfile.gettempdir() + osp.sep + 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- username = encoding.to_unicode_from_fs(os.environ.get('USER'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Modified to support MacPorts' buildbot environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ username = os.environ.get('USER')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not username:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ username = 'ANON'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ username = encoding.to_unicode_from_fs(username)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEMPDIR = tempfile.gettempdir() + osp.sep + 'spyder-' + username
</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;'>-@@ -33,6 +37,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Otherwise, return None"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for path in os.environ["PATH"].split(os.pathsep):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abspath = osp.join(path, basename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abspath = "/Applications/MacPorts/Qt4/" + basename + \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".app/Contents/MacOS/" + basename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return abspath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyderlib_widgets_shell.py.diff b/python/py-spyder/files/spyderlib_widgets_shell.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fdbe07..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyderlib_widgets_shell.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,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/widgets/shell.py.orig 2012-07-18 15:55:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/widgets/shell.py 2012-07-18 15:58:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,11 +227,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #------ Copy / Keyboard interrupt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def copy(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- """Copy text to clipboard... or keyboard interrupt"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Copy text to clipboard"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.has_selected_text():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ConsoleBaseWidget.copy(self)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.emit(SIGNAL("keyboard_interrupt()"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def interrupt(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Keyboard interrupt"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.emit(SIGNAL("keyboard_interrupt()"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def cut(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Cut text"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,9 +307,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy must be done first to be able to copy read-only text parts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (otherwise, right below, we would remove selection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if not on current line)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctrl = event.modifiers() & Qt.ControlModifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if event.key() == Qt.Key_C and ctrl:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.copy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if event.key() == Qt.Key_C and ((Qt.MetaModifier | Qt.ControlModifier) &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ event.modifiers()):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if event.modifiers() & Qt.MetaModifier: # OSX: Meta = control
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.interrupt()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif event.modifiers() & Qt.ControlModifier: # Control = command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.copy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- event.accept()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>