<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd35bf0a8d405efa003a92571b72822e92aa1866">https://github.com/macports/macports-ports/commit/fd35bf0a8d405efa003a92571b72822e92aa1866</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fd35bf0a8d405efa003a92571b72822e92aa1866
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sat Jul 7 08:18:37 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder: update to 3.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - add dependencies (py-keyring, py-spyder-kernels)
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove Qt4 variant (no longer supported by upstream)
</span>---
 python/py-spyder/Portfile                          | 52 +++++++---------------
 .../py-spyder/files/patch-scripts_spyder-qt4.diff  |  8 ----
 .../py-spyder/files/patch-scripts_spyder3-qt4.diff |  8 ----
 3 files changed, 15 insertions(+), 53 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 47dd0ad..16f73fa 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,10 +3,11 @@
</span> PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+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.2.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 3.3.0 v
</span> name                py-spyder
 # Preference on mailing list is to use small numbers for epoch.
 # This is already a date code, so sticking with dates.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +38,14 @@ supported_archs     noarch
</span> #pyNN-scipy doesn't build universal
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  a698ca83df7b795b0cee61406eb112e1256b639e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  508e473c64fec5197761d368a5dbfafd187b38e8e668df8bb2e1430b3b3eb61f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    4913127
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  378915665486f8ee1df54e56c11d36f74e24a2f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  9574537dd5710a31a85fde06dec4c42420f46bc30620122758fce74cf679b114 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3863798
</span> 
 if {${name} ne ${subport}} {
<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:#e0ffe0;'>+
</span>     conflicts       py${python.version}-spyder-devel
 
     depends_run-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +56,7 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-cloudpickle \
         port:py${python.version}-codestyle \
         port:py${python.version}-jedi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-keyring \
</span>         port:py${python.version}-nbconvert \
         port:py${python.version}-numpydoc \
         port:py${python.version}-pickleshare \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,34 +64,15 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-pyflakes \
         port:py${python.version}-pygments \
         port:py${python.version}-pylint \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-pyqt5 \
</span>         port:py${python.version}-qtawesome \
         port:py${python.version}-qtconsole \
         port:py${python.version}-qtpy \
         port:py${python.version}-rope \
         port:py${python.version}-sphinx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-spyder-kernels \
</span>         port:py${python.version}-zmq
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant pyqt5 conflicts pyqt4 description "Qt backend using PyQt5" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        PortGroup                  qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append         port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-pyqt5 webengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-qtpy qt5
</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;'>-    variant pyqt4 conflicts pyqt5 description "Qt backend using PyQt4" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        PortGroup                  qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append         port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                   port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-qtpy "" qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # make sure that py-pyqt4 is used when also py-pyqt5 is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append          patch-scripts_spyder-qt4.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                   patch-scripts_spyder3-qt4.diff
</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;'>-    if {![ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants    +pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     variant small description "Remove all optional dependencies." {}
 
     variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,10 +90,8 @@ if {${name} ne ${subport}} {
</span>     }
 
     variant docs description "Include offline Python and Qt documentation." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append        port:py${python.version}-htmldocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[ variant_isset pyqt5 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_lib-append    port:qt5-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</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;'>+                             port:qt5-docs
</span>     }
 
     variant pil description "Support image objects in editor through PIL or Pillow." {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,14 +117,8 @@ if {${name} ne ${subport}} {
</span>             ${worksrcpath}/spyder/app/mainwindow.py
         reinplace "s|@@PREFIX@@|${prefix}|g" \
             ${worksrcpath}/spyder/app/mainwindow.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</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>     }
 
     post-destroot {
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6a9face..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-scripts_spyder-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/spyder.orig    2018-05-20 13:13:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/spyder 2018-05-20 13:13:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.app import start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e954934..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/spyder3.orig   2018-05-20 13:13:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/spyder3        2018-05-20 13:14:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! /usr/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.app import start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start.main()
</span></pre><pre style='margin:0'>

</pre>