summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-03 12:38:14 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-03 15:04:31 +0200
commit7f1ced0e436ee73eac1303c1fd38eb751ecfcc05 (patch)
treefd8427f599691ba347e4f0ac30096fb3bb4dd086
parent820c3e30d6833cc02c991684c127fa1f7cbcf7d9 (diff)
downloadqutebrowser-7f1ced0e436ee73eac1303c1fd38eb751ecfcc05.tar.gz
qutebrowser-7f1ced0e436ee73eac1303c1fd38eb751ecfcc05.zip
ci: Set up nightly Python
-rw-r--r--.github/workflows/ci.yml13
-rw-r--r--tox.ini1
2 files changed, 13 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30b543d84..dc9d79a2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,6 +89,10 @@ jobs:
- testenv: py38-pyqt514
os: ubuntu-20.04
python: 3.8
+ ### PyQt 5.15 (Python nightly)
+ - testenv: py3-pyqt515
+ os: ubuntu-20.04
+ python: 3.10-dev
### PyQt 5.15 (Python 3.8, with coverage)
- testenv: py38-pyqt515-cov
os: ubuntu-20.04
@@ -98,7 +102,14 @@ jobs:
runs-on: "${{ matrix.os }}"
steps:
- uses: actions/checkout@v2
- - uses: actions/setup-python@v2
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ if: "!endsWith(matrix.python, '-dev')"
+ with:
+ python-version: "${{ matrix.python }}"
+ - name: Set up development Python
+ uses: deadsnakes/action@v1.0.0
+ if: "endsWith(matrix.python, '-dev')"
with:
python-version: "${{ matrix.python }}"
- name: Install apt dependencies
diff --git a/tox.ini b/tox.ini
index ed093c299..6ef8745c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,7 @@ setenv =
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PYTEST_ADDOPTS
basepython =
+ py3: {env:PYTHON:python3}
py35: {env:PYTHON:python3.5}
py36: {env:PYTHON:python3.6}
py37: {env:PYTHON:python3.7}