From e9aaec6d0d6f8d23fd97ac10f35f4da392c0225c Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 8 Sep 2016 09:50:53 -0700 Subject: [PATCH] Update tox.ini to support Windows, and adjust install instructions --- INSTALL.asciidoc | 6 ++++++ tox.ini | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/INSTALL.asciidoc b/INSTALL.asciidoc index e09b80827..61ed5fcde 100644 --- a/INSTALL.asciidoc +++ b/INSTALL.asciidoc @@ -331,6 +331,12 @@ https://docs.python.org/3/library/venv.html[virtual environment]: $ tox -e mkvenv ---- +On Windows, run tox with the 'mkvenv-win' option, however make sure that ONLY Python3 is in your PATH before running tox. + +---- +$ tox -e mkvenv-win +---- + This installs all needed Python dependencies in a `.venv` subfolder. The system-wide Qt5/PyQt5 installations are symlinked into the virtual environment. diff --git a/tox.ini b/tox.ini index 5c49ecce4..8754a5783 100644 --- a/tox.ini +++ b/tox.ini @@ -50,6 +50,15 @@ usedevelop = true deps = -r{toxinidir}/requirements.txt +# This is used for Windows, since binary name is different +[testenv:mkvenv-win] +basepython = python.exe +commands = {envpython} scripts/link_pyqt.py --tox {envdir} +envdir = {toxinidir}/.venv +usedevelop = true +deps = + -r{toxinidir}/requirements.txt + # This is undocumented, but it's a common typo, so let's make it work [testenv:mkenv] basepython = {[testenv:mkvenv]basepython}