<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c33577cd5ef9765d98790ed2bcbb5ff27108f9f0">https://github.com/macports/macports-ports/commit/c33577cd5ef9765d98790ed2bcbb5ff27108f9f0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c33577cd5ef9765d98790ed2bcbb5ff27108f9f0
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sat Feb 9 20:54:38 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 3.3.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - fix livecheck for only 3.x branch
</span>---
python/py-spyder/Portfile | 11 +++++++----
python/py-spyder/files/patch-spyder_app_mainwindow.py.diff | 6 +++---
python/py-spyder/files/patch-spyder_app_start.py.diff | 6 +++---
python/py-spyder/files/patch-spyder_config_base.py.diff | 12 ++++++------
python/py-spyder/files/patch-spyder_utils_programs.py.diff | 6 +++---
5 files changed, 22 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe01ee2..a9b44a3 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;'>@@ -7,8 +7,9 @@ PortGroup qt5 1.0
</span> PortGroup active_variants 1.1
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 3.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 3.3.3 v
</span> name py-spyder
<span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0e0e0;'>@@ -38,9 +39,9 @@ supported_archs noarch
</span> #pyNN-scipy doesn't build universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 94973e2faadc6e720ec3efec6dc8080e588da337 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 963f07d92748c0a5513ceac99a6203bdb15b8d032663841e01426a16ca0ee23a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3946683
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 466bde67cee4632054b09b947736947578adaf44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15a319d3868c98fe3b2c8b2610b0ba63399110c52b963bfdb558e54300a369ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3946956
</span>
if {${name} ne ${subport}} {
require_active_variants py${python.version}-pyqt5 webengine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,4 +145,6 @@ sudo port select --set ${select.group} [file tail ${select.file}]
</span> "
livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex (3\\.\\d+\.\\d+)
</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 2866342..43e3db7 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 2018-05-19 23:02:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py 2018-05-19 23:02:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,7 +212,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 87fbb05..3fd6c97 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 2018-05-19 22:59:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/start.py 2018-05-19 22:59:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,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 2f0ab21..1776aa8 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,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2018-05-19 22:50:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2018-05-19 22:51:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import tempfile
</span>
# Local imports
+from spyder import __version__
from spyder.utils import encoding
from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
to_text_string, is_text_string)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,10 +84,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,10 +86,10 @@
</span> # since 3.0+ we've reverted back to use .spyder to simplify major
# updates in version (required when we change APIs by Linux
# packagers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span>
# We can't have PY2 and PY3 settings in the same dir because:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,8 +95,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,8 +97,14 @@
</span> # embed a PY2 interpreter in PY3)
# 2. We need to save the list of installed modules (for code
# completion) separately for each version
<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 907fc59..a8532b0 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 2018-05-19 23:42:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2018-05-19 23:42:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2019-02-09 15:30:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2019-02-10 10:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
</pre><pre style='margin:0'>
</pre>