Skip to content

Commit

Permalink
Disable --importmode=importlib to work around pytest-dev/pytest#9645
Browse files Browse the repository at this point in the history
  • Loading branch information
CAM-Gerlach committed Feb 26, 2022
1 parent 7b27f76 commit d9dc0be
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.sh
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions 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
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -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

0 comments on commit d9dc0be

Please sign in to comment.