<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/0937f947fdd7e3388301150465374d98a5f6bc7f">https://github.com/macports/macports-ports/commit/0937f947fdd7e3388301150465374d98a5f6bc7f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0937f947fdd7e3388301150465374d98a5f6bc7f
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Jun 4 21:31:35 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-pytest-qt: add upstream patch for sip
</span>---
 python/py-pytest-qt/Portfile                      |  5 ++-
 python/py-pytest-qt/files/patch-qt_compat.py.diff | 47 +++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

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

</pre>