From d9dc0be440fb6bf416373cc473b5f2d42a7eb010 Mon Sep 17 00:00:00 2001
From: "C.A.M. Gerlach" <CAM.Gerlach@Gerlach.CAM>
Date: Fri, 25 Feb 2022 23:28:51 -0600
Subject: [PATCH] Disable --importmode=importlib to work around
 pytest-dev/pytest#9645

---
 .github/workflows/ci.yml  |  2 +-
 .github/workflows/test.sh |  2 +-
 MANIFEST.in               | 11 ++++++-----
 setup.cfg                 |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8736b2c4..6e3719e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     name: Test ${{ matrix.os }} Python ${{ matrix.python-version }} conda=${{ matrix.use-conda }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 20
     defaults:
       run:
         shell: ${{ matrix.special-invocation }}bash -l {0}
diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
index 7bce53c3..8d632927 100755
--- a/.github/workflows/test.sh
+++ b/.github/workflows/test.sh
@@ -11,7 +11,7 @@ BINDING=$(echo "$1" | tr '[:lower:]' '[:upper:]')
 QT_VERSION_VAR=${BINDING}_QT_VERSION
 if [ "${!QT_VERSION_VAR:0:3}" = "5.9" ]; then PYTESTQT_VERSION="=3.3.0"; fi  # pytest-qt >=4 doesn't support Qt >=5.9
 if [ "${PYTHON_VERSION}" = "3.6" ]; then PIP_VERSION="=21.3.1"; fi # pip >21.3.1 depends on the 'dataclasses' module (unavailable by default with Python 3.6)
-conda create -q -n test-env python=${PYTHON_VERSION} pytest 'pytest-cov>=3.0.0' pytest-qt${PYTESTQT_VERSION:-} pip${PIP_VERSION:-}
+conda create -q -n test-env python=${PYTHON_VERSION} "pytest>=6,!=7.0.0,!=7.0.1" "pytest-cov>=3.0.0" pytest-qt${PYTESTQT_VERSION:-} pip${PIP_VERSION:-}
 conda activate test-env
 
 if [ "$USE_CONDA" = "Yes" ]; then
diff --git a/MANIFEST.in b/MANIFEST.in
index 1d7cd43a..c089429f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
-include AUTHORS.md
-include CHANGELOG.md
-include LICENSE.txt
-include README.md
-include SECURITY.md
+include AUTHORS*
+include CHANGELOG*
+include LICENSE*
+include README*
+include SECURITY*
+include pytest.ini
 recursive-include qtpy/tests *.py *.ui
diff --git a/setup.cfg b/setup.cfg
index 9e749739..545bf92a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,6 +54,6 @@ exclude =
 
 [options.extras_require]
 test =
-    pytest>=6.0.0
+    pytest>=6,!=7.0.0,!=7.0.1
     pytest-cov>=3.0.0
     pytest-qt