diff options
| -rw-r--r-- | .github/workflows/ci.yml | 16 | ||||
| -rw-r--r-- | pytest.ini | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58ebc1f3f..c292d7986 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,21 +112,17 @@ jobs: - testenv: py38-pyqt514 os: ubuntu-20.04 python: 3.8 - ### PyQt 5.15 (Python 3.9) - - testenv: py39-pyqt515 + ### PyQt 5.15 (Python 3.9, with coverage) + - testenv: py39-pyqt515-cov os: ubuntu-20.04 python: 3.9 - ### PyQt 5.15 (Python 3.8, with coverage) - - testenv: py38-pyqt515-cov - os: ubuntu-20.04 - python: 3.8 - ### macOS: PyQt 5.14 (Python 3.7) - - testenv: py37-pyqt514 + ### macOS: PyQt 5.15 (Python 3.7 to match PyInstaller env) + - testenv: py37-pyqt515 os: macos-10.15 python: 3.7 args: "tests/unit" # Only run unit tests on macOS - ### Windows: PyQt 5.14 (Python 3.7) - - testenv: py37-pyqt514 + ### Windows: PyQt 5.15 (Python 3.7 to match PyInstaller env) + - testenv: py37-pyqt515 os: windows-2019 python: 3.7 runs-on: "${{ matrix.os }}" diff --git a/pytest.ini b/pytest.ini index 2906ada10..68c3676c7 100644 --- a/pytest.ini +++ b/pytest.ini @@ -75,6 +75,7 @@ qt_log_ignore = ^DirectWrite: CreateFontFaceFromHDC\(\) failed .* ^Attribute Qt::AA_ShareOpenGLContexts must be set before QCoreApplication is created\. ^QHttpNetworkConnectionPrivate::_q_hostLookupFinished could not de-queue request, failed to report HostNotFoundError + ^The available OpenGL surface format was either not version 3\.2 or higher or not a Core Profile.* xfail_strict = true filterwarnings = error |