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.
This commit is contained in:
Florian Bruhin 2017-03-08 07:40:53 +01:00
parent dfb4374ae1
commit ac0409c60d

11
tox.ini
View File

@ -15,7 +15,6 @@ setenv =
PYTEST_QT_API=pyqt5 PYTEST_QT_API=pyqt5
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt -r{toxinidir}/misc/requirements/requirements-tests.txt
commands = commands =
@ -120,7 +119,6 @@ commands = {envpython} scripts/link_pyqt.py --tox {envdir}
envdir = {toxinidir}/.venv envdir = {toxinidir}/.venv
usedevelop = true usedevelop = true
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
# This is used for Windows, since binary name is different # 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 envdir = {toxinidir}/.venv
usedevelop = true usedevelop = true
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
# This is undocumented, but it's a common typo, so let's make it work # 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 "" commands = {envpython} -c ""
usedevelop = true usedevelop = true
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
PyQt5 PyQt5
@ -178,7 +174,6 @@ commands =
[testenv:vulture] [testenv:vulture]
basepython = python3 basepython = python3
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-vulture.txt -r{toxinidir}/misc/requirements/requirements-vulture.txt
setenv = PYTHONPATH={toxinidir} setenv = PYTHONPATH={toxinidir}
@ -213,7 +208,6 @@ commands =
basepython = python3 basepython = python3
passenv = passenv =
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-flake8.txt -r{toxinidir}/misc/requirements/requirements-flake8.txt
commands = commands =
@ -223,7 +217,6 @@ commands =
basepython = python3 basepython = python3
passenv = passenv =
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/misc/requirements/requirements-pyroma.txt -r{toxinidir}/misc/requirements/requirements-pyroma.txt
commands = commands =
{envdir}/bin/pyroma . {envdir}/bin/pyroma .
@ -232,7 +225,6 @@ commands =
basepython = python3 basepython = python3
passenv = passenv =
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/misc/requirements/requirements-check-manifest.txt -r{toxinidir}/misc/requirements/requirements-check-manifest.txt
commands = commands =
{envdir}/bin/check-manifest --ignore 'qutebrowser/git-commit-id,qutebrowser/html/doc,qutebrowser/html/doc/*,*/__pycache__' {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 whitelist_externals = git
passenv = TRAVIS_PULL_REQUEST passenv = TRAVIS_PULL_REQUEST
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
@ -255,7 +246,6 @@ commands =
# fail if we didn't have a fallback defined. # fail if we didn't have a fallback defined.
basepython = {env:PYTHON:}/python.exe basepython = {env:PYTHON:}/python.exe
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-cxfreeze.txt -r{toxinidir}/misc/requirements/requirements-cxfreeze.txt
commands = commands =
@ -266,7 +256,6 @@ commands =
[testenv:pyinstaller] [testenv:pyinstaller]
basepython = python3 basepython = python3
deps = deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyinstaller.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt
whitelist_externals = whitelist_externals =