diff options
author | Florian Bruhin <me@the-compiler.org> | 2022-08-18 02:24:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-18 02:24:38 -0700 |
commit | 55b2fb6c9c8c6d1ca786fcb8207d4e9cebf705b3 (patch) | |
tree | c129dd1aee79b6a291bcef138fc5e43912612dc2 | |
parent | 62d3a80026d14c5d3ff85d58c3087947c76e4a43 (diff) | |
parent | d6b7d51307e08fa64c9acd2ed02eca876a1eec6d (diff) | |
download | qutebrowser-55b2fb6c9c8c6d1ca786fcb8207d4e9cebf705b3.tar.gz qutebrowser-55b2fb6c9c8c6d1ca786fcb8207d4e9cebf705b3.zip |
Merge pull request #7344 from qutebrowser/update-dependencies
Update dependencies
-rw-r--r-- | misc/requirements/requirements-dev.txt | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pylint.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-sphinx.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-tests.txt | 10 | ||||
-rw-r--r-- | misc/requirements/requirements-tox.txt | 4 | ||||
-rw-r--r-- | tests/end2end/fixtures/webserver.py | 21 |
6 files changed, 30 insertions, 13 deletions
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index 283d24e0c..d16135d18 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -14,7 +14,7 @@ hunter==3.4.3 idna==3.3 importlib-metadata==4.12.0 jeepney==0.8.0 -keyring==23.8.1 +keyring==23.8.2 manhole==1.8.0 packaging==21.3 pep517==0.13.0 @@ -32,7 +32,7 @@ requests==2.28.1 requests-toolbelt==0.9.1 rfc3986==2.0.0 rich==12.5.1 -SecretStorage==3.3.2 +SecretStorage==3.3.3 sip==6.6.2 six==1.16.0 toml==0.10.2 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 14974c084..ea37fa4d1 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -22,7 +22,7 @@ python-dateutil==2.8.2 requests==2.28.1 six==1.16.0 tomli==2.0.1 -tomlkit==0.11.2 +tomlkit==0.11.4 typed-ast==1.5.4 ; python_version<"3.8" typing_extensions==4.3.0 uritemplate==4.1.1 diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index 8292c6d45..b78767f13 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -13,7 +13,7 @@ MarkupSafe==2.1.1 packaging==21.3 Pygments==2.12.0 pyparsing==3.0.9 -pytz==2022.1 +pytz==2022.2.1 requests==2.28.1 snowballstemmer==2.2.0 Sphinx==5.1.1 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 0ac340d55..32282dfa6 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -9,11 +9,11 @@ click==8.1.3 coverage==6.4.3 exceptiongroup==1.0.0rc8 execnet==1.9.0 -filelock==3.7.1 -Flask==2.2.1 +filelock==3.8.0 +Flask==2.2.2 glob2==0.7 hunter==3.4.3 -hypothesis==6.54.1 +hypothesis==6.54.3 idna==3.3 importlib-metadata==4.12.0 iniconfig==1.1.1 @@ -23,7 +23,7 @@ jaraco.functools==3.5.1 Mako==1.2.1 manhole==1.8.0 # MarkupSafe==2.1.1 -more-itertools==8.13.0 +more-itertools==8.14.0 packaging==21.3 parse==1.19.0 parse-type==0.6.0 @@ -55,5 +55,5 @@ toml==0.10.2 tomli==2.0.1 urllib3==1.26.11 vulture==2.5 -Werkzeug==2.2.1 +Werkzeug==2.2.2 zipp==3.8.1 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 7c83c7cf2..601073740 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -1,14 +1,14 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py distlib==0.3.5 -filelock==3.7.1 +filelock==3.8.0 packaging==21.3 pip==22.2.2 platformdirs==2.5.2 pluggy==1.0.0 py==1.11.0 pyparsing==3.0.9 -setuptools==63.4.2 +setuptools==65.0.0 six==1.16.0 toml==0.10.2 tox==3.25.1 diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py index 2c2eab930..653bbf880 100644 --- a/tests/end2end/fixtures/webserver.py +++ b/tests/end2end/fixtures/webserver.py @@ -31,6 +31,7 @@ import pytest from PyQt5.QtCore import pyqtSignal, QUrl from end2end.fixtures import testprocess +from helpers import testutils class Request(testprocess.Line): @@ -125,6 +126,18 @@ class ExpectedRequest: return NotImplemented +def is_flask_development_message(message): + ignored_messages = [ + ("WARNING: This is a development server. Do not use it in a production " + "deployment. Use a production WSGI server instead."), + "Press CTRL+C to quit", + ] + return any( + testutils.pattern_match(pattern=pattern, value=message) + for pattern in ignored_messages + ) + + class WebserverProcess(testprocess.Process): """Abstraction over a running Flask server process. @@ -160,8 +173,12 @@ class WebserverProcess(testprocess.Process): def _parse_line(self, line): self._log(line) - started_re = re.compile(r' \* Running on https?://127\.0\.0\.1:{}/? ' - r'\(Press CTRL\+C to quit\)'.format(self.port)) + + if is_flask_development_message(line): + return None + + started_re = re.compile(r' \* Running on https?://127\.0\.0\.1:{}/?' + r'( \(Press CTRL\+C to quit\))?'.format(self.port)) if started_re.fullmatch(line): self.ready.emit() return None |