rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try harder to pin pip/setuptools

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-29 08:51:23 +02:00
parent b48b7eddc8
commit f218d5d4b6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/requirements/requirements-pip.txt
View File

@ -1 +1,3 @@
pip==8.1.2 pip==8.1.2
# https://github.com/pypa/setuptools/issues/702
setuptools==25.1.0 # rq.filter: != 25.1.1

12
tox.ini
View File

@ -14,6 +14,7 @@ setenv =
PYTEST_QT_API=pyqt5 PYTEST_QT_API=pyqt5
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_*
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 =
@ -74,7 +75,7 @@ ignore_errors = true
basepython = python3 basepython = python3
# For global .gitignore files # For global .gitignore files
passenv = HOME passenv = HOME
deps = deps = -r{toxinidir}/misc/requirements/requirements-pip.txt
commands = commands =
{envpython} scripts/dev/misc_checks.py git {envpython} scripts/dev/misc_checks.py git
{envpython} scripts/dev/misc_checks.py vcs {envpython} scripts/dev/misc_checks.py vcs
@ -82,7 +83,9 @@ commands =
[testenv:vulture] [testenv:vulture]
basepython = python3 basepython = python3
deps = -r{toxinidir}/misc/requirements/requirements-vulture.txt deps =
-r{toxinidir}/misc/requirements/requirements-pip.txt
-r{toxinidir}/misc/requirements/requirements-vulture.txt
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} scripts/dev/run_vulture.py {envpython} scripts/dev/run_vulture.py
@ -141,6 +144,7 @@ skip_install = true
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}
@ -154,6 +158,7 @@ commands =
basepython = {env:PYTHON:}/python.exe basepython = {env:PYTHON:}/python.exe
skip_install = true skip_install = true
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 =
@ -165,6 +170,7 @@ commands =
basepython = python3 basepython = python3
skip_install = true skip_install = true
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
commands = commands =
@ -173,6 +179,6 @@ commands =
[testenv:eslint] [testenv:eslint]
skip_install = True skip_install = True
deps = deps = -r{toxinidir}/misc/requirements/requirements-pip.txt
whitelist_externals = eslint whitelist_externals = eslint
commands = eslint qutebrowser commands = eslint qutebrowser