From 7b24ac9df77a5601836ceecb1cc39bd54f7792f8 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 17 Mar 2021 13:56:01 +0100 Subject: tox: Add a bleeding environment See #6298 --- misc/requirements/requirements-tests-bleeding.txt | 37 +++++++++++++++++++++++ misc/requirements/requirements-tests-git.txt | 37 ----------------------- tox.ini | 10 ++++++ 3 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 misc/requirements/requirements-tests-bleeding.txt delete mode 100644 misc/requirements/requirements-tests-git.txt diff --git a/misc/requirements/requirements-tests-bleeding.txt b/misc/requirements/requirements-tests-bleeding.txt new file mode 100644 index 000000000..cbefb99f3 --- /dev/null +++ b/misc/requirements/requirements-tests-bleeding.txt @@ -0,0 +1,37 @@ +# Problematic: needs bzr +# bzr+lp:beautifulsoup +beautifulsoup4 +git+https://github.com/cherrypy/cheroot.git +git+https://github.com/nedbat/coveragepy.git +git+https://github.com/pallets/flask.git +git+https://github.com/pallets/werkzeug.git # transitive dep, but needed to work +git+https://github.com/HypothesisWorks/hypothesis.git#subdirectory=hypothesis-python +git+https://github.com/pytest-dev/pytest.git +git+https://github.com/pytest-dev/pytest-bdd.git +git+https://github.com/ionelmc/pytest-benchmark.git +git+https://github.com/pytest-dev/pytest-instafail.git +git+https://github.com/pytest-dev/pytest-mock.git +git+https://github.com/pytest-dev/pytest-qt.git +git+https://github.com/pytest-dev/pytest-rerunfailures.git + +git+https://github.com/ionelmc/python-hunter.git +git+https://github.com/jendrikseipp/vulture.git +git+https://github.com/pygments/pygments.git +git+https://github.com/pytest-dev/pytest-repeat.git +git+https://github.com/pytest-dev/pytest-cov.git +git+https://github.com/The-Compiler/pytest-xvfb.git +git+https://github.com/pytest-dev/pytest-xdist.git +git+https://github.com/hjwp/pytest-icdiff.git +git+https://github.com/john-kurkowski/tldextract +# Problematic: needs rust (and some time to build) +# git+https://github.com/ArniDagur/python-adblock.git +adblock ; python_version!="3.10" + +## qutebrowser dependencies + +git+https://github.com/pallets/jinja.git +git+https://github.com/yaml/pyyaml.git +git+https://github.com/tartley/colorama.git + +# https://github.com/pyparsing/pyparsing/issues/271 +pyparsing!=3.0.0b2,!=3.0.0b1 diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt deleted file mode 100644 index cbefb99f3..000000000 --- a/misc/requirements/requirements-tests-git.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Problematic: needs bzr -# bzr+lp:beautifulsoup -beautifulsoup4 -git+https://github.com/cherrypy/cheroot.git -git+https://github.com/nedbat/coveragepy.git -git+https://github.com/pallets/flask.git -git+https://github.com/pallets/werkzeug.git # transitive dep, but needed to work -git+https://github.com/HypothesisWorks/hypothesis.git#subdirectory=hypothesis-python -git+https://github.com/pytest-dev/pytest.git -git+https://github.com/pytest-dev/pytest-bdd.git -git+https://github.com/ionelmc/pytest-benchmark.git -git+https://github.com/pytest-dev/pytest-instafail.git -git+https://github.com/pytest-dev/pytest-mock.git -git+https://github.com/pytest-dev/pytest-qt.git -git+https://github.com/pytest-dev/pytest-rerunfailures.git - -git+https://github.com/ionelmc/python-hunter.git -git+https://github.com/jendrikseipp/vulture.git -git+https://github.com/pygments/pygments.git -git+https://github.com/pytest-dev/pytest-repeat.git -git+https://github.com/pytest-dev/pytest-cov.git -git+https://github.com/The-Compiler/pytest-xvfb.git -git+https://github.com/pytest-dev/pytest-xdist.git -git+https://github.com/hjwp/pytest-icdiff.git -git+https://github.com/john-kurkowski/tldextract -# Problematic: needs rust (and some time to build) -# git+https://github.com/ArniDagur/python-adblock.git -adblock ; python_version!="3.10" - -## qutebrowser dependencies - -git+https://github.com/pallets/jinja.git -git+https://github.com/yaml/pyyaml.git -git+https://github.com/tartley/colorama.git - -# https://github.com/pyparsing/pyparsing/issues/271 -pyparsing!=3.0.0b2,!=3.0.0b1 diff --git a/tox.ini b/tox.ini index 70329f9e6..e305e5c4d 100644 --- a/tox.ini +++ b/tox.ini @@ -38,6 +38,16 @@ commands = {envpython} -bb -m pytest {posargs:tests} cov: {envpython} scripts/dev/check_coverage.py {posargs} +[testenv:bleeding] +basepython = {env:PYTHON:python3} +setenv = + PYTEST_QT_API=pyqt5 + QUTE_BDD_WEBENGINE=true +pip_pre = true +deps = -r{toxinidir}/misc/requirements/requirements-tests-bleeding.txt +commands_pre = pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine +commands = {envpython} -bb -m pytest {posargs:tests} + # other envs [testenv:misc] -- cgit v1.2.3-54-g00ecf