<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/8920b908f091903a01a79780bfc030d5ab4c6dd2">https://github.com/macports/macports-ports/commit/8920b908f091903a01a79780bfc030d5ab4c6dd2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8920b908f091903a01a79780bfc030d5ab4c6dd2
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Nov 6 08:17:09 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-qtpy: add py38 subport, remove variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ports that use py-qtpy should additionally declare a dependency on the
</span><span style='display:block; white-space:pre;color:#404040;'> backend to use.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Check if any of the backends is installed; if not add a warning about
</span><span style='display:block; white-space:pre;color:#404040;'> this in the notes and do not run the test-phase.
</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/57823
</span>---
python/py-qtpy/Portfile | 52 ++++++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qtpy/Portfile b/python/py-qtpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53daa94..8cd1ec3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qtpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qtpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,18 +5,18 @@ PortGroup python 1.0
</span> PortGroup github 1.0
github.setup spyder-ide qtpy 1.9.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name py-qtpy
categories-append devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span> platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span> maintainers {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Abtraction layer for PyQt5/PyQt4/PySide2/PySide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Abstraction layer for PyQt5/PyQt4/PySide2/PySide
</span> long_description QtPy (pronounced 'cutie pie') is a small abstraction layer \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- that lets you write applications using a single api call \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that lets you write applications using a single API call \
</span> to either PyQt or PySide. \
It provides support for PyQt5, PyQt4, PySide2 and PySide \
using the Qt5 layout (where the QtGui module has been split \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,28 +26,20 @@ checksums rmd160 2c557686126864e9f0ea150ff0769a7744f91928 \
</span> sha256 436cffcd843a51703ee69e3c800aa471e0b887e491b3612ae6fd3ffeaa940fd2 \
size 35576
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-setuptools
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Will *work* with either/both under the hood, but provide variants to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine what we label as depends_lib. (We need at least one installed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and we don't want to force installing both.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt5 description {Depend on pyqt5. (Else pyqt4)} {
</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;'>- depends_lib-delete port:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mock
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_test-append port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-mock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd py.test-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd py.test-${python.branch}
</span> test.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env PYTHONPATH=${worksrcpath}/build/lib
</span>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +47,19 @@ if {${name} ne ${subport}} {
</span> xinstall -m 0644 -W ${worksrcpath} LICENSE.txt ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "QtPy will work with one of the following backends: pyqt5, pyqt4,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyside2, and pyside. If multiple backends are available on your system,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyqt5 will be used unless you set the QT_API environment variable."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "QtPy needs one of the following backends to be installed on your\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system: PyQt5, PyQt4,PySide2, or Pyside. If multiple backends are\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ available, PyQt5 will be used unless you set the QT_API environment variable."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if no backend is installed, it is impossible to run the tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also append a warning about this to the notes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [catch {set installed [lindex [registry_active py${python.version}-pyqt5] 0]}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [catch {set installed [lindex [registry_active py${python.version}-pyqt4] 0]}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [catch {set installed [lindex [registry_active py${python.version}-pyside2] 0]}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [catch {set installed [lindex [registry_active py${python.version}-pyside] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "*** WARNING: currently none of the required backends is installed! ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>