<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/ded770905fa7e4046c17e905c2147b9fd2a9d85f">https://github.com/macports/macports-ports/commit/ded770905fa7e4046c17e905c2147b9fd2a9d85f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new ded770905fa py-pytest-qt: update to 4.0.1
</span>ded770905fa is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ded770905fa7e4046c17e905c2147b9fd2a9d85f
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Jun 7 10:00:30 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-pytest-qt: update to 4.0.1
</span>---
 python/py-pytest-qt/Portfile                      | 13 +++----
 python/py-pytest-qt/files/patch-qt_compat.py.diff | 47 -----------------------
 2 files changed, 5 insertions(+), 55 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytest-qt/Portfile b/python/py-pytest-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a3378ea81c..1fad881f1c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytest-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytest-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-pytest-qt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             4.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> 
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description    ${description}
</span> 
 homepage            https://github.com/pytest-dev/pytest-qt
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  fba315d2166ef5bd8fbf088f1a73648d6892fe88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  45687ab906f4828eb73d9fca2369326970e4ae0addb7ec0767bf5e968d66b581 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    113333
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  aca982eb55108c46fc8a81b9c8c2999106c207e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  2d435dd1426ae1b134bc7f0bb2688cac620f94e83db74022428fcc07cfd74342 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    113473
</span> 
 python.versions     27 35 36 37 38 39
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,6 @@ if {${name} ne ${subport}} {
</span>         checksums   rmd160  4921d99da764e7e20ac092408b840e3892b1cbed \
                     sha256  714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925 \
                     size    113439
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patch.pre_args  -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles  patch-qt_compat.py.diff
</span>     }
 
     depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytest-qt/files/patch-qt_compat.py.diff b/python/py-pytest-qt/files/patch-qt_compat.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f1f7c715170..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytest-qt/files/patch-qt_compat.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,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see also: https://github.com/pytest-dev/pytest-qt/issues/369
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 480662b7baf7366ae3b987d13b0d9d2ef497d925 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Bruhin <me@the-compiler.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 5 Jun 2021 00:21:34 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix sip import for distributions packaging it as sip
</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;'>- CHANGELOG.rst             | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/pytestqt/qt_compat.py | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 15 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CHANGELOG.rst b/CHANGELOG.rst
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 747ee5e..54e10bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CHANGELOG.rst
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CHANGELOG.rst
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+4.0.1 (UNRELEASED)
</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;'>-+- The ``sip`` module now gets imported directly if ``PyQt5.sip`` /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  ``PyQt6.sip`` wasn't found, as it's still packaged like that in some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  distributions (`#369`_). Thanks `@The-Compiler`_ for the PR.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.. _#369: https://github.com/pytest-dev/pytest-qt/pull/369
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4.0.0 (2021-06-03)
</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;'>-diff --git a/src/pytestqt/qt_compat.py b/src/pytestqt/qt_compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 788cd7e..22de12e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/pytestqt/qt_compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/pytestqt/qt_compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,7 +141,12 @@ def _import_module(module_name):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             self.isdeleted = lambda obj: not shiboken6.isValid(obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             assert self.is_pyqt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            self.isdeleted = _import_module("sip").isdeleted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                sip = _import_module("sip")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                # some distributions still package PyQt5.sip as sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                import sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            self.isdeleted = sip.isdeleted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _check_qt_api_version(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if not self.is_pyqt:
</span></pre><pre style='margin:0'>

</pre>