diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-01-20 12:21:59 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-01-20 12:29:17 +0100 |
| commit | 788a3955b8ebf63a93e68926a047c22b9c684ea0 (patch) | |
| tree | 0487e73be6f9ab46b2eb7e4ec1c6930ddcdfc5c3 | |
| parent | 734dcab8ec7a2716c94f98b4e46daa5ff6e370b4 (diff) | |
| download | qutebrowser-788a3955b8ebf63a93e68926a047c22b9c684ea0.tar.gz qutebrowser-788a3955b8ebf63a93e68926a047c22b9c684ea0.zip | |
ci: Update Python versions
| -rw-r--r-- | .github/workflows/ci.yml | 32 | ||||
| -rw-r--r-- | doc/qutebrowser.1.asciidoc | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 20 insertions, 15 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e50ba2c60..279916ff7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: key: "${{ matrix.testenv }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('scripts/dev/pylint_checkers/qute_pylint/*.py') }}" - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/setup-node@v2-beta with: node-version: '12.x' @@ -108,41 +108,45 @@ jobs: ### PyQt 5.12 (Python 3.6) - testenv: py36-pyqt512 os: ubuntu-18.04 - python: 3.6 + python: '3.6' ### PyQt 5.13 (Python 3.7) - testenv: py37-pyqt513 os: ubuntu-20.04 - python: 3.7 + python: '3.7' ### PyQt 5.14 (Python 3.8) - testenv: py38-pyqt514 os: ubuntu-20.04 - python: 3.8 + python: '3.8' ### PyQt 5.15.0 (Python 3.9) - testenv: py39-pyqt5150 os: ubuntu-20.04 - python: 3.9 - ### PyQt 5.15 (Python 3.9, with coverage) - - testenv: py39-pyqt515-cov + python: '3.9' + ### PyQt 5.15 (Python 3.9) + - testenv: py39-pyqt515 + os: ubuntu-20.04 + python: '3.9' + ### PyQt 5.15 (Python 3.10, with coverarge) + - testenv: py310-pyqt515-cov os: ubuntu-20.04 - python: 3.9 - ### PyQt 5.15 (Python 3.10) - - testenv: py310-pyqt515 + python: '3.10' + ### PyQt 5.15 (Python 3.11) + - testenv: py311-pyqt515 os: ubuntu-20.04 - python: 3.10-dev + python: '3.11-dev' ### macOS: PyQt 5.15 (Python 3.9 to match PyInstaller env) - testenv: py39-pyqt515 os: macos-10.15 - python: 3.7 + python: '3.7' args: "tests/unit" # Only run unit tests on macOS ### macOS Big Sur # - testenv: py39-pyqt515 # os: macos-11.0 - # python: 3.9 + # python: '3.9' # args: "tests/unit" # Only run unit tests on macOS ### Windows: PyQt 5.15 (Python 3.9 to match PyInstaller env) - testenv: py39-pyqt515 os: windows-2019 - python: 3.9 + python: '3.9' runs-on: "${{ matrix.os }}" steps: - uses: actions/checkout@v2 diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc index bc312f108..f22be1ddc 100644 --- a/doc/qutebrowser.1.asciidoc +++ b/doc/qutebrowser.1.asciidoc @@ -34,7 +34,7 @@ show it. *'URL'*:: URLs to open on startup (empty as a window separator). -=== optional arguments +=== options *-h*, *--help*:: show this help message and exit @@ -23,6 +23,7 @@ basepython = py38: {env:PYTHON:python3.8} py39: {env:PYTHON:python3.9} py310: {env:PYTHON:python3.10} + py311: {env:PYTHON:python3.11} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-tests.txt |