summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2024-04-30 23:56:31 +0200
committerFlorian Bruhin <me@the-compiler.org>2024-05-24 17:08:56 +0200
commit0f511711418f5cadd207fe31db2f782e6b860b69 (patch)
treeb1b4b0e7f0212adc15635d8fcaeac99a3ded2de9 /tox.ini
parent8b44c26146f27b08e81571d7ca242631651c15e6 (diff)
downloadqutebrowser-0f511711418f5cadd207fe31db2f782e6b860b69.tar.gz
qutebrowser-0f511711418f5cadd207fe31db2f782e6b860b69.zip
Revert "Try getting PyQt 6.7 from Riverbank server"
This reverts commit 6c4be8ef03bdcf09e86e14de02b8bd308e6e527b. Possibly easier solution in next commit.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini14
1 files changed, 0 insertions, 14 deletions
diff --git a/tox.ini b/tox.ini
index 884ff9068..8ce7b22b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,13 +51,6 @@ deps =
pyqt65: -r{toxinidir}/misc/requirements/requirements-pyqt-6.5.txt
pyqt66: -r{toxinidir}/misc/requirements/requirements-pyqt-6.6.txt
pyqt67: -r{toxinidir}/misc/requirements/requirements-pyqt-6.7.txt
-# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html
-# --no-deps since we install from a complete requirements.txt anyways.
-install_command =
- pyqt67: python -I -m pip install --no-deps {opts} {packages}
- !pyqt67: python -I -m pip install {opts} {packages}
-commands_pre =
- pyqt67: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ PyQt6-WebEngine-Qt6
commands =
!pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67: {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}
@@ -200,13 +193,6 @@ passenv =
PYINSTALLER_DEBUG
setenv =
qt5: PYINSTALLER_QT5=true
-# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html
-# --no-deps since we install from a complete requirements.txt anyways.
-install_command =
- !qt5: python -I -m pip install --no-deps {opts} {packages}
- qt5: python -I -m pip install {opts} {packages}
-commands_pre =
- !qt5: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ PyQt6-WebEngine-Qt6
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyinstaller.txt