summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-30 16:23:05 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-30 16:23:05 +0200
commit76eed0aa9c4f01f8282a9f305b8fde64588d26c4 (patch)
treeb8da78c5d4893ec99f9fa62853aef5b845a49666 /tox.ini
parent8d54226e6d3c1d39155c0306d0b663ea51adae7c (diff)
downloadqutebrowser-76eed0aa9c4f01f8282a9f305b8fde64588d26c4.tar.gz
qutebrowser-76eed0aa9c4f01f8282a9f305b8fde64588d26c4.zip
tox: Simplify pyinstaller envs
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini14
1 files changed, 2 insertions, 12 deletions
diff --git a/tox.ini b/tox.ini
index 0cd722f1a..309584355 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@
envlist = py38-pyqt515-cov,mypy,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint
distshare = {toxworkdir}
skipsdist = true
+minversion = 3.15
[testenv]
setenv =
@@ -158,7 +159,7 @@ commands =
{envpython} scripts/dev/check_doc_changes.py {posargs}
{envpython} scripts/asciidoc2html.py {posargs}
-[testenv:pyinstaller]
+[testenv:pyinstaller-{64,32}]
basepython = {env:PYTHON:python3}
pip_version = pip
passenv = APPDATA HOME PYINSTALLER_DEBUG
@@ -169,17 +170,6 @@ deps =
commands =
{envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec
-[testenv:pyinstaller32]
-# A copy of the pyinstaller environment above, to be used for 32-bit on Windows
-# to make sure the both installations are separated.
-# This doesn't actually do anything 32-bit specific, that part happens by
-# setting the PYTHON environment variable accordingly.
-basepython = {[testenv:pyinstaller]basepython}
-pip_version = {[testenv:pyinstaller]pip_version}
-passenv = {[testenv:pyinstaller]passenv}
-deps = {[testenv:pyinstaller]deps}
-commands = {[testenv:pyinstaller]commands}
-
[testenv:eslint]
basepython = python3
deps =