summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/changelog.asciidoc11
-rw-r--r--misc/requirements/requirements-dev.txt2
-rw-r--r--misc/requirements/requirements-mypy.txt8
-rw-r--r--misc/requirements/requirements-pyinstaller.txt2
-rw-r--r--misc/requirements/requirements-tests.txt16
-rw-r--r--misc/requirements/requirements-tox.txt10
-rw-r--r--misc/requirements/requirements-vulture.txt2
-rwxr-xr-xmisc/userscripts/view_in_mpv7
-rw-r--r--qutebrowser/utils/urlutils.py2
-rw-r--r--qutebrowser/utils/version.py4
-rw-r--r--tests/unit/utils/test_urlutils.py8
-rw-r--r--tox.ini4
12 files changed, 45 insertions, 31 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index f1bd96f81..3b6254141 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,17 @@ breaking changes (such as renamed commands) can happen in minor releases.
// `Fixed` for any bug fixes.
// `Security` to invite users to upgrade in case of vulnerabilities.
+[[v3.0.1]]
+v3.0.1 (unreleased)
+-------------------
+
+Fixed
+~~~~~
+
+- The "restore video" functionality of the `view_in_mpv` script works again on
+ webengine.
+- Setting `url.auto_search` to `dns` works correctly now with Qt 6.
+
[[v3.0.0]]
v3.0.0 (2023-08-18)
-------------------
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 61a10c38e..2c73d53d1 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -30,7 +30,7 @@ Pympler==1.0.1
pyproject_hooks==1.0.0
PyQt-builder==1.15.2
python-dateutil==2.8.2
-readme-renderer==40.0
+readme-renderer==41.0
requests==2.31.0
requests-toolbelt==1.0.0
rfc3986==2.0.0
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 1faf875fd..55585ad40 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -6,16 +6,16 @@ importlib-resources==6.0.1
Jinja2==3.1.2
lxml==4.9.3
MarkupSafe==2.1.3
-mypy==1.5.0
+mypy==1.5.1
mypy-extensions==1.0.0
-pluggy==1.2.0
+pluggy==1.3.0
Pygments==2.16.1
PyQt5-stubs==5.15.6.0
tomli==2.0.1
types-colorama==0.4.15.12
-types-docutils==0.20.0.2
+types-docutils==0.20.0.3
types-Pygments==2.16.0.0
types-PyYAML==6.0.12.11
-types-setuptools==68.0.0.3
+types-setuptools==68.1.0.0
typing_extensions==4.7.1
zipp==3.16.2
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index b112963b0..8dd0ea6ec 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -2,4 +2,4 @@
altgraph==0.17.3
pyinstaller @ git+https://github.com/pyinstaller/pyinstaller.git@79f62ef29822169ae00cd4271390d0e3175476ad
-pyinstaller-hooks-contrib==2023.6
+pyinstaller-hooks-contrib==2023.7
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a51a099c7..f49b0cf5f 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -6,19 +6,19 @@ blinker==1.6.2
certifi==2023.7.22
charset-normalizer==3.2.0
cheroot==10.0.0
-click==8.1.6
+click==8.1.7
coverage==7.3.0
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
execnet==2.0.2
filelock==3.12.2
-Flask==2.3.2
+Flask==2.3.3
hunter==3.6.1
-hypothesis==6.82.4
+hypothesis==6.82.6
idna==3.4
importlib-metadata==6.8.0
iniconfig==2.0.0
itsdangerous==2.1.2
-jaraco.functools==3.8.1
+jaraco.functools==3.9.0
# Jinja2==3.1.2
Mako==1.2.4
manhole==1.8.0
@@ -27,7 +27,7 @@ more-itertools==10.1.0
packaging==23.1
parse==1.19.1
parse-type==0.6.2
-pluggy==1.2.0
+pluggy==1.3.0
py-cpuinfo==9.0.0
Pygments==2.16.1
pytest==7.4.0
@@ -52,6 +52,6 @@ toml==0.10.2
tomli==2.0.1
typing_extensions==4.7.1
urllib3==2.0.4
-vulture==2.8
-Werkzeug==2.3.6
+vulture==2.9.1
+Werkzeug==2.3.7
zipp==3.16.2
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 064536480..ef2f11955 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -8,10 +8,10 @@ filelock==3.12.2
packaging==23.1
pip==23.2.1
platformdirs==3.10.0
-pluggy==1.2.0
-pyproject-api==1.5.3
-setuptools==68.0.0
+pluggy==1.3.0
+pyproject-api==1.5.4
+setuptools==68.1.2
tomli==2.0.1
-tox==4.8.0
+tox==4.10.0
virtualenv==20.24.3
-wheel==0.41.1
+wheel==0.41.2
diff --git a/misc/requirements/requirements-vulture.txt b/misc/requirements/requirements-vulture.txt
index 8c98a265e..1d091baf3 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.8
+vulture==2.9.1
diff --git a/misc/userscripts/view_in_mpv b/misc/userscripts/view_in_mpv
index 472920433..4f371c6b5 100755
--- a/misc/userscripts/view_in_mpv
+++ b/misc/userscripts/view_in_mpv
@@ -49,7 +49,7 @@ msg() {
MPV_COMMAND=${MPV_COMMAND:-mpv}
# Warning: spaces in single flags are not supported
-MPV_FLAGS=${MPV_FLAGS:- --force-window --no-terminal --keep-open=yes --ytdl}
+MPV_FLAGS=${MPV_FLAGS:- --force-window --quiet --keep-open=yes --ytdl}
IFS=" " read -r -a video_command <<< "$MPV_COMMAND $MPV_FLAGS"
js() {
@@ -94,9 +94,9 @@ cat <<EOF
<a style=\\"font-weight: bold;
color: white;
background: transparent;
+ cursor: pointer;
\\"
onClick=\\"restore_video(this, " + i + ");\\"
- href=\\"javascript: restore_video(this, " + i + ")\\"
>click here</a>.
</p>
";
@@ -119,7 +119,6 @@ cat <<EOF
function restore_video(obj, index) {
obj = App.all_replacements[index];
video = App.backup_videos[index];
- console.log(video);
obj.parentNode.replaceChild(video, obj);
}
@@ -137,7 +136,7 @@ EOF
printjs() {
js | sed 's,//.*$,,' | tr '\n' ' '
}
-echo "jseval -q $(printjs)" >> "$QUTE_FIFO"
+echo "jseval -q -w main $(printjs)" >> "$QUTE_FIFO"
msg info "Opening $QUTE_URL with mpv"
"${video_command[@]}" "$@" "$QUTE_URL"
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 0b571946d..7b613c0a2 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -226,7 +226,7 @@ def _is_url_dns(urlstr: str) -> bool:
return False
log.url.debug("Doing DNS request for {}".format(host))
info = QHostInfo.fromName(host)
- return not info.error()
+ return info.error() == QHostInfo.HostInfoError.NoError
def fuzzy_url(urlstr: str,
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index ce816b9fd..888172535 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -604,10 +604,12 @@ class WebEngineVersions:
# 6.4.3: Security fixes up to 110.0.5481.78 (2023-02-07)
utils.VersionNumber(6, 4): '102.0.5005.177',
- # Qt 6.5: Chromium 105
+ # Qt 6.5: Chromium 108
# 108.0.5359.220 (~2022-12-23)
# (.220 claimed by code, .181 claimed by CHROMIUM_VERSION)
# 6.5.0: Security fixes up to 110.0.5481.104 (2023-02-16)
+ # 6.5.1: Security fixes up to 112.0.5615.138 (2023-04-18)
+ # 6.5.2: Security fixes up to 114.0.5735.133 (2023-06-13)
utils.VersionNumber(6, 5): '108.0.5359.220',
}
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index bbd55e36c..d2eab5928 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -10,7 +10,7 @@ import dataclasses
import urllib.parse
from qutebrowser.qt.core import QUrl
-from qutebrowser.qt.network import QNetworkProxy
+from qutebrowser.qt.network import QNetworkProxy, QHostInfo
import pytest
import hypothesis
import hypothesis.strategies
@@ -38,7 +38,7 @@ class FakeDNS:
@dataclasses.dataclass
class FakeDNSAnswer:
- error: bool
+ error: QHostInfo.HostInfoError
def __init__(self):
self.used = False
@@ -53,7 +53,9 @@ class FakeDNS:
self.answer = None
def _get_error(self):
- return not self.answer
+ if self.answer:
+ return QHostInfo.HostInfoError.NoError
+ return QHostInfo.HostInfoError.HostNotFound
def fromname_mock(self, _host):
"""Simple mock for QHostInfo::fromName returning a FakeDNSAnswer."""
diff --git a/tox.ini b/tox.ini
index 06c96cdf1..87decce12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -70,8 +70,8 @@ setenv =
pip_pre = true
deps = -r{toxinidir}/misc/requirements/requirements-tests-bleeding.txt
commands_pre =
- qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine PyQt5-Qt5 PyQtWebEngine-Qt5 PyQt5-sip
- !qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt6 PyQt6-WebEngine PyQt6-Qt6 PyQt6-WebEngine-Qt6 PyQt6-sip
+ qt5: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine PyQt5-Qt5 PyQtWebEngine-Qt5 PyQt5-sip
+ !qt5: pip install --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt6 PyQt6-WebEngine PyQt6-Qt6 PyQt6-WebEngine-Qt6 PyQt6-sip
commands = {envpython} -bb -m pytest {posargs:tests}
# other envs
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion