From ac0409c60d0d6b565d2e4044bf87c34c43d2e6a7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 8 Mar 2017 07:40:53 +0100 Subject: [PATCH] Don't install requirements-pip.txt It causes stuff to blow up when something in there got upgraded, and we ask pip to downgrade one of its dependencies. We still keep the file around so we get notified about updates. --- tox.ini | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tox.ini b/tox.ini index 0aa0652e7..b17ddf098 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ setenv = PYTEST_QT_API=pyqt5 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-tests.txt commands = @@ -120,7 +119,6 @@ commands = {envpython} scripts/link_pyqt.py --tox {envdir} envdir = {toxinidir}/.venv usedevelop = true deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt # This is used for Windows, since binary name is different @@ -130,7 +128,6 @@ commands = {envpython} scripts/link_pyqt.py --tox {envdir} envdir = {toxinidir}/.venv usedevelop = true deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt # This is undocumented, but it's a common typo, so let's make it work @@ -148,7 +145,6 @@ envdir = {toxinidir}/.venv commands = {envpython} -c "" usedevelop = true deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt PyQt5 @@ -178,7 +174,6 @@ commands = [testenv:vulture] basepython = python3 deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-vulture.txt setenv = PYTHONPATH={toxinidir} @@ -213,7 +208,6 @@ commands = basepython = python3 passenv = deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-flake8.txt commands = @@ -223,7 +217,6 @@ commands = basepython = python3 passenv = deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/misc/requirements/requirements-pyroma.txt commands = {envdir}/bin/pyroma . @@ -232,7 +225,6 @@ commands = basepython = python3 passenv = deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/misc/requirements/requirements-check-manifest.txt commands = {envdir}/bin/check-manifest --ignore 'qutebrowser/git-commit-id,qutebrowser/html/doc,qutebrowser/html/doc/*,*/__pycache__' @@ -242,7 +234,6 @@ basepython = python3 whitelist_externals = git passenv = TRAVIS_PULL_REQUEST deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt commands = {envpython} scripts/link_pyqt.py --tox {envdir} @@ -255,7 +246,6 @@ commands = # fail if we didn't have a fallback defined. basepython = {env:PYTHON:}/python.exe deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-cxfreeze.txt commands = @@ -266,7 +256,6 @@ commands = [testenv:pyinstaller] basepython = python3 deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt whitelist_externals =