summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2023-03-18 15:20:19 +1300
committertoofar <toofar@spalge.com>2023-03-18 17:29:25 +1300
commitf68798a0816bd109ddb135816c03aeb1f81fa61c (patch)
treecd26e7987810a8f79b911415b971294acee9da80 /tox.ini
parent151d808940f6988ef4d41bdaf309b447d70a1c2d (diff)
downloadqutebrowser-f68798a0816bd109ddb135816c03aeb1f81fa61c.tar.gz
qutebrowser-f68798a0816bd109ddb135816c03aeb1f81fa61c.zip
ci: attempt to make the qt6 docker run work
On CI were were getting "Could not import sip" because link_pyqt was looking for PyQt5.sip. I made that look at QUTE_QT_WRAPPER since that's being set already on tox.ini There are probably a few other changes around link_pyqt and the makefile etc we need to change when we switch the default wrapper. I overrode the default `py` tox environment with py-qt6 to override those wrapper related variables. I probably could have done something sneaky with curly braces to make it so we don't have to add a few more lines to the file. But in my opinion in config file is far to obfuscated and hard to maintain already. I changed the docker file to call the new py-qt6 env if it's a qt6 container. I'm not 100% sure that is required though since there is also a tox invocation in the GH action definition, maybe that overrides the container entrypoint? Also changed the indentation in the dockerfile template a bit to make it easier to see where the conditionals start and end. Speaking of which I changed the matrix definition and tox invocation to match a later one to hopefully make it so we can invoke different tox environments in the containers without having to rebuild the containers. Not sure I did that right, I'll see soon. I added the unstable-qt6 container generation line so we can use it in the future, and to match the not-qt6 one. I'm not switching to that in CI though because the pyqt used by that is broken at the moment (ref https://www.riverbankcomputing.com/pipermail/pyqt/2023-March/045214.html) Also fixed the vim modeline in generate.py so my syntax highlighting works.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 842e527b7..2fba834cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,6 +53,11 @@ commands =
{envpython} -bb -m pytest {posargs:tests}
cov: {envpython} scripts/dev/check_coverage.py {posargs}
+[testenv:py-qt6]
+setenv =
+ PYTEST_QT_API=pyqt6
+ QUTE_QT_WRAPPER=PyQt6
+
[testenv:bleeding]
basepython = {env:PYTHON:python3}
setenv =