diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt deleted file mode 100644 index 440a94443..000000000 --- a/misc/requirements/requirements-pip.txt +++ /dev/null @@ -1,2 +0,0 @@ -pip==8.1.2 -setuptools==28.7.1 diff --git a/scripts/dev/ci/appveyor_install.py b/scripts/dev/ci/appveyor_install.py index 978cca335..62400e04a 100644 --- a/scripts/dev/ci/appveyor_install.py +++ b/scripts/dev/ci/appveyor_install.py @@ -61,8 +61,7 @@ except (OSError, IOError): print("Installing PyQt5...") subprocess.check_call([r'C:\install-PyQt5.exe', '/S']) -print("Installing pip/tox") -pip_install(r'-rmisc\requirements\requirements-pip.txt') +print("Installing tox") pip_install(r'-rmisc\requirements\requirements-tox.txt') print("Linking Python...") diff --git a/tox.ini b/tox.ini index 8754a5783..22e584667 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_* deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-tests.txt commands = @@ -93,7 +92,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} @@ -137,7 +135,6 @@ commands = basepython = python3 passenv = deps = - -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/misc/requirements/requirements-pyroma.txt commands = {envdir}/bin/pyroma . @@ -146,7 +143,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__' @@ -156,7 +152,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} @@ -169,7 +164,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 = @@ -180,7 +174,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 commands =