summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Cebula <tomiesz@users.noreply.github.com>2022-09-20 11:17:46 +0200
committerGitHub <noreply@github.com>2022-09-20 11:17:46 +0200
commit64f6284375efe2016dbd0bf2ee2ba31964e07011 (patch)
treedb6e9d5e04542f2c4738cabaf97b023e24909a14
parent79bb6670d8969b850965cd5d895bcd8f09d59311 (diff)
parent03e510acff238e0247f76a1f3fcc66cc6a7f5dda (diff)
downloadqutebrowser-64f6284375efe2016dbd0bf2ee2ba31964e07011.tar.gz
qutebrowser-64f6284375efe2016dbd0bf2ee2ba31964e07011.zip
Merge branch 'qutebrowser:master' into master
-rw-r--r--misc/requirements/requirements-dev.txt19
-rw-r--r--misc/requirements/requirements-flake8.txt2
-rw-r--r--misc/requirements/requirements-pyinstaller.txt4
-rw-r--r--misc/requirements/requirements-pylint.txt15
-rw-r--r--misc/requirements/requirements-pyroma.txt6
-rw-r--r--misc/requirements/requirements-qutebrowser.txt-raw11
-rw-r--r--misc/requirements/requirements-sphinx.txt6
-rw-r--r--misc/requirements/requirements-tests.txt18
-rw-r--r--misc/requirements/requirements-tox.txt10
-rw-r--r--misc/requirements/requirements-vulture.txt2
-rw-r--r--misc/requirements/requirements-yamllint.txt4
-rw-r--r--qutebrowser/completion/completer.py1
-rw-r--r--requirements.txt5
-rw-r--r--scripts/dev/changelog_urls.json2
-rw-r--r--scripts/dev/ua_fetch.py1
15 files changed, 58 insertions, 48 deletions
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 777c78796..d864d28d4 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -3,31 +3,33 @@
bleach==5.0.1
build==0.8.0
bump2version==1.0.1
-certifi==2022.6.15
+certifi==2022.9.14
cffi==1.15.1
charset-normalizer==2.1.1
commonmark==0.9.1
-cryptography==37.0.4
+cryptography==38.0.1
docutils==0.19
github3.py==3.2.0
-hunter==3.4.3
-idna==3.3
+hunter==3.5.0
+idna==3.4
importlib-metadata==4.12.0
+jaraco.classes==3.2.2
jeepney==0.8.0
-keyring==23.8.2
+keyring==23.9.3
manhole==1.8.0
+more-itertools==8.14.0
packaging==21.3
pep517==0.13.0
pkginfo==1.8.3
ply==3.11
pycparser==2.21
Pygments==2.13.0
-PyJWT==2.4.0
+PyJWT==2.5.0
Pympler==1.0.1
pyparsing==3.0.9
PyQt-builder==1.13.0
python-dateutil==2.8.2
-readme-renderer==37.0
+readme-renderer==37.1
requests==2.28.1
requests-toolbelt==0.9.1
rfc3986==2.0.0
@@ -38,8 +40,9 @@ six==1.16.0
toml==0.10.2
tomli==2.0.1
twine==4.0.1
+types-cryptography==3.3.23
typing_extensions==4.3.0
uritemplate==4.1.1
-# urllib3==1.26.11
+# urllib3==1.26.12
webencodings==0.5.1
zipp==3.8.1
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 78660a405..d1f671612 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
attrs==22.1.0
flake8==5.0.4
-flake8-bugbear==22.7.1
+flake8-bugbear==22.9.11
flake8-builtins==1.5.3
flake8-comprehensions==3.10.0
flake8-copyright==0.2.3
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 3db372d82..4a5ac9359 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -1,5 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
altgraph==0.17.2
-pyinstaller==5.3
-pyinstaller-hooks-contrib==2022.8
+pyinstaller==5.4.1
+pyinstaller-hooks-contrib==2022.10
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index acc335c55..e017e6ba6 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,22 +1,22 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-astroid==2.11.7
-certifi==2022.6.15
+astroid==2.12.10
+certifi==2022.9.14
cffi==1.15.1
charset-normalizer==2.1.1
-cryptography==37.0.4
+cryptography==38.0.1
dill==0.3.5.1
future==0.18.2
github3.py==3.2.0
-idna==3.3
+idna==3.4
isort==5.10.1
lazy-object-proxy==1.7.1
mccabe==0.7.0
pefile==2022.5.30
platformdirs==2.5.2
pycparser==2.21
-PyJWT==2.4.0
-pylint==2.14.5
+PyJWT==2.5.0
+pylint==2.15.2
python-dateutil==2.8.2
./scripts/dev/pylint_checkers
requests==2.28.1
@@ -24,7 +24,8 @@ six==1.16.0
tomli==2.0.1
tomlkit==0.11.4
typed-ast==1.5.4 ; python_version<"3.8"
+types-cryptography==3.3.23
typing_extensions==4.3.0
uritemplate==4.1.1
-# urllib3==1.26.11
+# urllib3==1.26.12
wrapt==1.14.1
diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
index f7f97fba1..97addae15 100644
--- a/misc/requirements/requirements-pyroma.txt
+++ b/misc/requirements/requirements-pyroma.txt
@@ -1,10 +1,10 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
build==0.8.0
-certifi==2022.6.15
+certifi==2022.9.14
charset-normalizer==2.1.1
docutils==0.19
-idna==3.3
+idna==3.4
packaging==21.3
pep517==0.13.0
Pygments==2.13.0
@@ -12,4 +12,4 @@ pyparsing==3.0.9
pyroma==4.0
requests==2.28.1
tomli==2.0.1
-urllib3==1.26.11
+urllib3==1.26.12
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index c628f528a..ab18a7caa 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -2,8 +2,13 @@ Jinja2
PyYAML
## Only used on macOS to make borderless windows resizable
-pyobjc-core
-pyobjc-framework-Cocoa
+## our recompile_requirements.py can't really deal with
+## platform-specific dependencies unfortunately...
+# pyobjc-core
+# pyobjc-framework-Cocoa
+#@ add: # Unpinned due to recompile_requirements.py limitations
+#@ add: pyobjc-core ; sys_platform=="darwin"
+#@ add: pyobjc-framework-Cocoa ; sys_platform=="darwin"
## stdlib backports
importlib-resources
@@ -20,5 +25,3 @@ typing_extensions # from importlib-metadata
#@ markers: importlib-resources python_version=="3.7.*" or python_version=="3.8.*"
#@ markers: importlib-metadata python_version=="3.7.*"
#@ markers: typing_extensions python_version<"3.8"
-#@ markers: pyobjc-core sys_platform=="darwin"
-#@ markers: pyobjc-framework-Cocoa sys_platform=="darwin"
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index 50c892cf0..72c43f952 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -2,10 +2,10 @@
alabaster==0.7.12
Babel==2.10.3
-certifi==2022.6.15
+certifi==2022.9.14
charset-normalizer==2.1.1
docutils==0.19
-idna==3.3
+idna==3.4
imagesize==1.4.1
importlib-metadata==4.12.0
Jinja2==3.1.2
@@ -23,5 +23,5 @@ sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
-urllib3==1.26.11
+urllib3==1.26.12
zipp==3.8.1
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a7e55e32d..ce09a7f67 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -2,25 +2,25 @@
attrs==22.1.0
beautifulsoup4==4.11.1
-certifi==2022.6.15
+certifi==2022.9.14
charset-normalizer==2.1.1
cheroot==8.6.0
click==8.1.3
coverage==6.4.4
-exceptiongroup==1.0.0rc8
+exceptiongroup==1.0.0rc9
execnet==1.9.0
filelock==3.8.0
Flask==2.2.2
glob2==0.7
-hunter==3.4.3
-hypothesis==6.54.4
-idna==3.3
+hunter==3.5.0
+hypothesis==6.54.6
+idna==3.4
importlib-metadata==4.12.0
iniconfig==1.1.1
itsdangerous==2.1.2
jaraco.functools==3.5.1
# Jinja2==3.1.2
-Mako==1.2.1
+Mako==1.2.2
manhole==1.8.0
# MarkupSafe==2.1.1
more-itertools==8.14.0
@@ -32,7 +32,7 @@ py==1.11.0
py-cpuinfo==8.0.0
Pygments==2.13.0
pyparsing==3.0.9
-pytest==7.1.2
+pytest==7.1.3
pytest-bdd==6.0.1
pytest-benchmark==3.4.1
pytest-cov==3.0.0
@@ -53,7 +53,7 @@ soupsieve==2.3.2.post1
tldextract==3.3.1
toml==0.10.2
tomli==2.0.1
-urllib3==1.26.11
-vulture==2.5
+urllib3==1.26.12
+vulture==2.6
Werkzeug==2.2.2
zipp==3.8.1
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index e8975efda..a7ee19364 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -1,6 +1,6 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-distlib==0.3.5
+distlib==0.3.6
filelock==3.8.0
packaging==21.3
pip==22.2.2
@@ -8,9 +8,9 @@ platformdirs==2.5.2
pluggy==1.0.0
py==1.11.0
pyparsing==3.0.9
-setuptools==65.2.0
+setuptools==65.3.0
six==1.16.0
-toml==0.10.2
-tox==3.25.1
-virtualenv==20.16.3
+tomli==2.0.1
+tox==3.26.0
+virtualenv==20.16.5
wheel==0.37.1
diff --git a/misc/requirements/requirements-vulture.txt b/misc/requirements/requirements-vulture.txt
index 482a74195..7d0ef20d3 100644
--- a/misc/requirements/requirements-vulture.txt
+++ b/misc/requirements/requirements-vulture.txt
@@ -1,4 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
toml==0.10.2
-vulture==2.5
+vulture==2.6
diff --git a/misc/requirements/requirements-yamllint.txt b/misc/requirements/requirements-yamllint.txt
index 78e80a261..efec35e56 100644
--- a/misc/requirements/requirements-yamllint.txt
+++ b/misc/requirements/requirements-yamllint.txt
@@ -1,5 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-pathspec==0.9.0
+pathspec==0.10.1
PyYAML==6.0
-yamllint==1.27.1
+yamllint==1.28.0
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index cf6984288..34e68fd2a 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -165,7 +165,6 @@ class Completer(QObject):
# cursor is in a space between two existing words
parts.insert(i, '')
prefix = [x.strip() for x in parts[:i]]
- # pylint: disable-next=unnecessary-list-index-lookup
center = parts[i].strip()
# strip trailing whitespace included as a separate token
postfix = [x.strip() for x in parts[i+1:] if not x.isspace()]
diff --git a/requirements.txt b/requirements.txt
index fe6001ae4..e0ea72e0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,8 +7,9 @@ importlib-resources==5.9.0 ; python_version=="3.7.*" or python_version=="3.8.*"
Jinja2==3.1.2
MarkupSafe==2.1.1
Pygments==2.13.0
-pyobjc-core==8.5 ; sys_platform=="darwin"
-pyobjc-framework-Cocoa==8.5 ; sys_platform=="darwin"
PyYAML==6.0
typing_extensions==4.3.0 ; python_version<"3.8"
zipp==3.8.1
+# Unpinned due to recompile_requirements.py limitations
+pyobjc-core ; sys_platform=="darwin"
+pyobjc-framework-Cocoa ; sys_platform=="darwin"
diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json
index bcf30fc78..5ddb1b949 100644
--- a/scripts/dev/changelog_urls.json
+++ b/scripts/dev/changelog_urls.json
@@ -97,6 +97,7 @@
"wrapt": "https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst",
"pep517": "https://github.com/pypa/pep517/blob/main/doc/changelog.rst",
"cryptography": "https://cryptography.io/en/latest/changelog.html",
+ "types-cryptography": "https://github.com/python/typeshed/commits/master/stubs/cryptography",
"toml": "https://github.com/uiri/toml/releases",
"tomli": "https://github.com/hukkin/tomli/blob/master/CHANGELOG.md",
"PyQt5": "https://www.riverbankcomputing.com/news",
@@ -145,6 +146,7 @@
"bleach": "https://github.com/mozilla/bleach/blob/main/CHANGES",
"jeepney": "https://gitlab.com/takluyver/jeepney/-/blob/master/docs/release-notes.rst",
"keyring": "https://github.com/jaraco/keyring/blob/main/CHANGES.rst",
+ "jaraco.classes": "https://github.com/jaraco/jaraco.classes/blob/main/CHANGES.rst",
"pkginfo": "https://bazaar.launchpad.net/~tseaver/pkginfo/trunk/view/head:/CHANGES.txt",
"readme-renderer": "https://github.com/pypa/readme_renderer/blob/main/CHANGES.rst",
"requests-toolbelt": "https://github.com/requests/toolbelt/blob/master/HISTORY.rst",
diff --git a/scripts/dev/ua_fetch.py b/scripts/dev/ua_fetch.py
index 6e5bc66ac..743cd252e 100644
--- a/scripts/dev/ua_fetch.py
+++ b/scripts/dev/ua_fetch.py
@@ -42,6 +42,7 @@ def wrap(ini, sub, string):
return textwrap.wrap(string, width=80, initial_indent=ini, subsequent_indent=sub)
+# pylint: disable-next=missing-timeout
response = requests.get('https://raw.githubusercontent.com/Kikobeats/top-user-agents/master/index.json')
if response.status_code != 200: