From 8a59762e041bff3e4628111613d24ce6ae49d6b9 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Mon, 1 May 2023 04:23:51 +0000 Subject: Update dependencies --- misc/requirements/requirements-dev.txt | 10 +++++----- misc/requirements/requirements-pylint.txt | 12 ++++++------ misc/requirements/requirements-pyroma.txt | 4 ++-- misc/requirements/requirements-sphinx.txt | 4 ++-- misc/requirements/requirements-tests.txt | 15 ++++++++------- misc/requirements/requirements-tox.txt | 10 +++++----- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index 81373f671..ffc7499aa 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -8,8 +8,8 @@ cffi==1.15.1 charset-normalizer==3.1.0 cryptography==40.0.2 docutils==0.19 -github3.py==4.0.0 -hunter==3.5.1 +github3.py==4.0.1 +hunter==3.6.1 idna==3.4 importlib-metadata==6.6.0 importlib-resources==5.12.0 @@ -31,10 +31,10 @@ pyproject_hooks==1.0.0 PyQt-builder==1.15.0 python-dateutil==2.8.2 readme-renderer==37.3 -requests==2.28.2 -requests-toolbelt==0.10.1 +requests==2.29.0 +requests-toolbelt==1.0.0 rfc3986==2.0.0 -rich==13.3.4 +rich==13.3.5 SecretStorage==3.3.3 sip==6.7.9 six==1.16.0 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 04bffc588..6fb63a15c 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -1,27 +1,27 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -astroid==2.15.3 +astroid==2.15.4 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 cryptography==40.0.2 dill==0.3.6 -github3.py==4.0.0 +github3.py==4.0.1 idna==3.4 isort==5.11.5 lazy-object-proxy==1.9.0 mccabe==0.7.0 pefile==2023.2.7 -platformdirs==3.2.0 +platformdirs==3.5.0 pycparser==2.21 PyJWT==2.6.0 -pylint==2.17.2 +pylint==2.17.3 python-dateutil==2.8.2 ./scripts/dev/pylint_checkers -requests==2.28.2 +requests==2.29.0 six==1.16.0 tomli==2.0.1 -tomlkit==0.11.7 +tomlkit==0.11.8 typed-ast==1.5.4 ; python_version<"3.8" typing_extensions==4.5.0 uritemplate==4.1.1 diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index e280d3aa4..ab4b35aed 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -9,7 +9,7 @@ packaging==23.1 Pygments==2.15.1 pyproject_hooks==1.0.0 pyroma==4.2 -requests==2.28.2 +requests==2.29.0 tomli==2.0.1 -trove-classifiers==2023.4.22 +trove-classifiers==2023.4.29 urllib3==1.26.15 diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index 0f7737afb..b93e96fe3 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -13,9 +13,9 @@ MarkupSafe==2.1.2 packaging==23.1 Pygments==2.15.1 pytz==2023.3 -requests==2.28.2 +requests==2.29.0 snowballstemmer==2.2.0 -Sphinx==6.2.0 +Sphinx==7.0.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index e0df90ac1..c976e648f 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -2,17 +2,18 @@ attrs==23.1.0 beautifulsoup4==4.12.2 +blinker==1.6.2 certifi==2022.12.7 charset-normalizer==3.1.0 cheroot==9.0.0 click==8.1.3 -coverage==7.2.3 +coverage==7.2.5 exceptiongroup==1.1.1 execnet==1.9.0 filelock==3.12.0 -Flask==2.2.3 -hunter==3.5.1 -hypothesis==6.72.1 +Flask==2.3.1 +hunter==3.6.1 +hypothesis==6.75.1 idna==3.4 importlib-metadata==6.6.0 iniconfig==2.0.0 @@ -41,16 +42,16 @@ pytest-rerunfailures==11.1.2 pytest-xdist==3.2.1 pytest-xvfb==2.0.0 PyVirtualDisplay==3.0 -requests==2.28.2 +requests==2.29.0 requests-file==1.5.1 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.4.1 -tldextract==3.4.0 +tldextract==3.4.1 toml==0.10.2 tomli==2.0.1 typing_extensions==4.5.0 urllib3==1.26.15 vulture==2.7 -Werkzeug==2.2.3 +Werkzeug==2.3.2 zipp==3.15.0 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 7a28f9747..4166a798a 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -6,12 +6,12 @@ colorama==0.4.6 distlib==0.3.6 filelock==3.12.0 packaging==23.1 -pip==23.1.1 -platformdirs==3.2.0 +pip==23.1.2 +platformdirs==3.5.0 pluggy==1.0.0 pyproject_api==1.5.1 -setuptools==67.7.1 +setuptools==67.7.2 tomli==2.0.1 -tox==4.4.12 -virtualenv==20.22.0 +tox==4.5.1 +virtualenv==20.23.0 wheel==0.40.0 -- cgit v1.2.3-54-g00ecf From 8b2b4fc61e16cc6e8d8ad966dd1a6eeabd72652b Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 7 May 2023 12:02:41 +1200 Subject: Flask updates, pin for py37 and add blinker Pin Flask and Werkzeug for py3.7 They've removed compatibility upstream. Added example to readme file because I had to go dig for one in the commit history. Add blinker to changelog URLs as it's a required dependency of Flask now. --- misc/requirements/README.md | 7 +++++++ misc/requirements/requirements-tests.txt | 6 ++++-- misc/requirements/requirements-tests.txt-raw | 5 +++++ scripts/dev/changelog_urls.json | 3 ++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/misc/requirements/README.md b/misc/requirements/README.md index 330233bca..d90a065e9 100644 --- a/misc/requirements/README.md +++ b/misc/requirements/README.md @@ -19,4 +19,11 @@ Some examples: #@ filter: mypkg != 1.0.0 #@ ignore: mypkg, otherpkg #@ replace: foo bar + +## Use the marker line to restrict the unpinned Flask requirement to python +## 3.7. For python 3.7 add a specific version into the output. +Flask +# Python 3.7 +#@ markers: Flask python_version>="3.7" +#@ add: Flask==2.2.5 ; python_version=="3.7.*" ``` diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index c976e648f..954bc55b9 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -11,7 +11,7 @@ coverage==7.2.5 exceptiongroup==1.1.1 execnet==1.9.0 filelock==3.12.0 -Flask==2.3.1 +Flask==2.3.1 ; python_version>="3.8" hunter==3.6.1 hypothesis==6.75.1 idna==3.4 @@ -53,5 +53,7 @@ tomli==2.0.1 typing_extensions==4.5.0 urllib3==1.26.15 vulture==2.7 -Werkzeug==2.3.2 +Werkzeug==2.3.2 ; python_version>="3.8" zipp==3.15.0 +Werkzeug==2.2.3 ; python_version=="3.7.*" +Flask==2.2.5 ; python_version=="3.7.*" diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw index 54e036106..f50754ba6 100644 --- a/misc/requirements/requirements-tests.txt-raw +++ b/misc/requirements/requirements-tests.txt-raw @@ -32,3 +32,8 @@ pytest-xdist tldextract #@ ignore: Jinja2, MarkupSafe, colorama +# Python 3.7 +#@ markers: Flask python_version>="3.8" +#@ add: Flask==2.2.5 ; python_version=="3.7.*" +#@ markers: Werkzeug python_version>="3.8" +#@ add: Werkzeug==2.2.3 ; python_version=="3.7.*" diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index 67820cd47..eed9032dd 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -161,5 +161,6 @@ "asciidoc": "https://asciidoc-py.github.io/CHANGELOG.html", "pyproject_hooks": "https://pyproject-hooks.readthedocs.io/en/latest/changelog.html", "markdown-it-py": "https://github.com/executablebooks/markdown-it-py/blob/master/CHANGELOG.md", - "mdurl": "https://github.com/executablebooks/mdurl/commits/master" + "mdurl": "https://github.com/executablebooks/mdurl/commits/master", + "blinker": "https://blinker.readthedocs.io/en/stable/#changes" } -- cgit v1.2.3-54-g00ecf From 8168fb983e013bf28edbe16410625e0e9b30892f Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 7 May 2023 13:49:19 +1200 Subject: update link_pyqt for tox 4 Although we updated the tox requirements files for tox4 in December, it looks like the docker containers (or at least the one(s) that call this script) are still using tox3. `.tox-config1` isn't written anymore with tox4 (although my git-fu isn't strong enough to find the commit that removed it). The "Rebuild Docker CI images" run 912 was the last to have tox 3.26.0-2 and run 913 had version 4.4.12-1. I'm not sure the new change does the same thing as whatever the old code did. I honestly have no idea why we can't just follow the python symlink and have to go to a config file. In what case does the python binary not link to the system one? In addition to this `.tox-info.json` file there is also the more standard `pyvenv.cfg` file. I would prefer to use that over the tox thing as generally I find tox to be a high barrier of entry for contributors. But in that case the pyvenv one doesn't seem to be well documented either... Anyway, if anyone knows any cases where following the symlink of the python in the venv isn't reliable that would be great. Because that seems like the simpler method. --- scripts/link_pyqt.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py index ff524f056..028c18ee2 100644 --- a/scripts/link_pyqt.py +++ b/scripts/link_pyqt.py @@ -28,6 +28,7 @@ import sys import subprocess import tempfile import filecmp +import json class Error(Exception): @@ -200,9 +201,15 @@ def get_venv_lib_path(path): def get_tox_syspython(tox_path): """Get the system python based on a virtualenv created by tox.""" path = os.path.join(tox_path, '.tox-config1') - with open(path, encoding='ascii') as f: - line = f.readline() - _md5, sys_python = line.rstrip().split(' ', 1) + if os.path.exists(path): # tox3 + with open(path, encoding='ascii') as f: + line = f.readline() + _md5, sys_python = line.rstrip().split(' ', 1) + else: # tox4 + path = os.path.join(tox_path, '.tox-info.json') + with open(path, encoding='utf-8') as f: + data = json.load(f) + sys_python = data["Python"]["executable"] # Follow symlinks to get the system-wide interpreter if we have a tox isolated # build. return os.path.realpath(sys_python) -- cgit v1.2.3-54-g00ecf From 64811478a301c0a706d0ae063dddb9035814ef2c Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 7 May 2023 14:56:50 +1200 Subject: Manually bump flask and werkzeug to fix cookie issue These tests were failing on webkit due to cookies not getting set (they made a change recently to fix a security issue around cookies and must have messed something up) tests/end2end/test_invocations.py::test_cookies_store tests/end2end/features/test_private_bdd.py::test_make_sure_private_data_is_not_cleared_when_closing_a_private_window_but_another_remains --- misc/requirements/requirements-tests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 954bc55b9..befbbf989 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -11,7 +11,7 @@ coverage==7.2.5 exceptiongroup==1.1.1 execnet==1.9.0 filelock==3.12.0 -Flask==2.3.1 ; python_version>="3.8" +Flask==2.3.2 ; python_version>="3.8" hunter==3.6.1 hypothesis==6.75.1 idna==3.4 @@ -53,7 +53,7 @@ tomli==2.0.1 typing_extensions==4.5.0 urllib3==1.26.15 vulture==2.7 -Werkzeug==2.3.2 ; python_version>="3.8" +Werkzeug==2.3.3 ; python_version>="3.8" zipp==3.15.0 Werkzeug==2.2.3 ; python_version=="3.7.*" Flask==2.2.5 ; python_version=="3.7.*" -- cgit v1.2.3-54-g00ecf