Skip to content

Commit d9dc0be

Browse files
committed
Disable --importmode=importlib to work around pytest-dev/pytest#9645
1 parent 7b27f76 commit d9dc0be

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
test:
1818
name: Test ${{ matrix.os }} Python ${{ matrix.python-version }} conda=${{ matrix.use-conda }}
1919
runs-on: ${{ matrix.os }}
20-
timeout-minutes: 15
20+
timeout-minutes: 20
2121
defaults:
2222
run:
2323
shell: ${{ matrix.special-invocation }}bash -l {0}

.github/workflows/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BINDING=$(echo "$1" | tr '[:lower:]' '[:upper:]')
1111
QT_VERSION_VAR=${BINDING}_QT_VERSION
1212
if [ "${!QT_VERSION_VAR:0:3}" = "5.9" ]; then PYTESTQT_VERSION="=3.3.0"; fi # pytest-qt >=4 doesn't support Qt >=5.9
1313
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)
14-
conda create -q -n test-env python=${PYTHON_VERSION} pytest 'pytest-cov>=3.0.0' pytest-qt${PYTESTQT_VERSION:-} pip${PIP_VERSION:-}
14+
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:-}
1515
conda activate test-env
1616

1717
if [ "$USE_CONDA" = "Yes" ]; then

MANIFEST.in

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
include AUTHORS.md
2-
include CHANGELOG.md
3-
include LICENSE.txt
4-
include README.md
5-
include SECURITY.md
1+
include AUTHORS*
2+
include CHANGELOG*
3+
include LICENSE*
4+
include README*
5+
include SECURITY*
6+
include pytest.ini
67
recursive-include qtpy/tests *.py *.ui

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ exclude =
5454

5555
[options.extras_require]
5656
test =
57-
pytest>=6.0.0
57+
pytest>=6,!=7.0.0,!=7.0.1
5858
pytest-cov>=3.0.0
5959
pytest-qt

0 commit comments

Comments
 (0)