diff options
| -rw-r--r-- | .flake8 | 2 | ||||
| -rw-r--r-- | README.asciidoc | 2 | ||||
| -rw-r--r-- | doc/changelog.asciidoc | 4 | ||||
| -rw-r--r-- | qutebrowser/misc/checkpyver.py | 4 | ||||
| -rw-r--r-- | qutebrowser/misc/earlyinit.py | 2 | ||||
| -rw-r--r-- | tests/end2end/test_invocations.py | 2 |
6 files changed, 8 insertions, 8 deletions
@@ -50,7 +50,7 @@ ignore = A003, W503, W504 FI15 -min-version = 3.6.0 +min-version = 3.6.1 max-complexity = 12 per-file-ignores = qutebrowser/api/hook.py : N801 diff --git a/README.asciidoc b/README.asciidoc index 42013368c..08891867d 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -74,7 +74,7 @@ Requirements The following software and libraries are required to run qutebrowser: -* https://www.python.org/[Python] 3.6 or newer +* https://www.python.org/[Python] 3.6.1 or newer * https://www.qt.io/[Qt] 5.12.0 or newer (5.12 LTS or 5.15 recommended) with the following modules: - QtCore / qtbase diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index ceb5faa46..face04c4d 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -21,8 +21,8 @@ v2.0.0 (unreleased) Major changes ~~~~~~~~~~~~~ -- At least Python 3.6 is now required to run qutebrowser, support for Python - 3.5 is dropped. Note that Python 3.5 is +- At least Python 3.6.1 is now required to run qutebrowser, support for Python + 3.5 (and 3.6.0) is dropped. Note that Python 3.5 is https://www.python.org/downloads/release/python-3510/[no longer supported upstream] since September 2020. - At least Qt/PyQt 5.12 is now required to run qutebrowser, support for 5.7 to diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py index 6f6659a24..28ababcb9 100644 --- a/qutebrowser/misc/checkpyver.py +++ b/qutebrowser/misc/checkpyver.py @@ -43,11 +43,11 @@ except ImportError: # pragma: no cover # to stderr. def check_python_version(): """Check if correct python version is run.""" - if sys.hexversion < 0x03060000: + if sys.hexversion < 0x03060100: # We don't use .format() and print_function here just in case someone # still has < 2.6 installed. version_str = '.'.join(map(str, sys.version_info[:3])) - text = ("At least Python 3.6 is required to run qutebrowser, but " + + text = ("At least Python 3.6.1 is required to run qutebrowser, but " + "it's running with " + version_str + ".\n") if (Tk and # type: ignore[unreachable] '--no-err-windows' not in sys.argv): # pragma: no cover diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 8027ad69a..413e9d111 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -19,7 +19,7 @@ """Things which need to be done really early (e.g. before importing Qt). -At this point we can be sure we have all python 3.6 features available. +At this point we can be sure we have all python 3.6.1 features available. """ try: diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py index 1d2f79a1a..a55f31b52 100644 --- a/tests/end2end/test_invocations.py +++ b/tests/end2end/test_invocations.py @@ -325,7 +325,7 @@ def test_launching_with_old_python(python): except FileNotFoundError: pytest.skip(f"{python} not found") assert proc.returncode == 1 - error = "At least Python 3.6 is required to run qutebrowser" + error = "At least Python 3.6.1 is required to run qutebrowser" assert proc.stderr.decode('ascii').startswith(error) |