requirements: Add importlib-metadata

7 files changed, 24 insertions, 1 deletions

diff --git a/README.asciidoc b/README.asciidoc
index 4e35e83c3..704058bd7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -105,6 +105,10 @@ The following libraries are optional:
 * https://pypi.org/project/adblock/[adblock] (for improved adblocking using ABP syntax)
 * On Windows, https://pypi.python.org/pypi/colorama/[colorama] for colored log
   output.
+* https://importlib-metadata.readthedocs.io/[importlib_resources] on Python 3.7
+  or older, to improve QtWebEngine version detection when PyQtWebEngine is
+  installed via pip (thus, this dependency usually isn't relevant for
+  packagers).
 * https://asciidoc.org/[asciidoc] to generate the documentation for the `:help`
   command, when using the git repository (rather than a release).
 
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0a2c0ff93..3bd311e7e 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -24,6 +24,9 @@ Added
 
 - New `:screenshot` command which can be used to screenshot the visible part of
   the page.
+- New optional dependency on the `importlib_metadata` project on Python 3.7 and
+  below. This is only relevant when PyQtWebEngine is installed via pip - thus,
+  this dependency usually isn't relevant for packagers.
 
 Changed
 ~~~~~~~
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 64d751659..a8fa2cecd 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -2,6 +2,7 @@
 
 chardet==4.0.0
 diff-cover==4.2.1
+importlib-metadata==3.7.0
 importlib-resources==5.1.0
 inflect==5.0.2
 Jinja2==2.11.3
@@ -15,3 +16,4 @@ Pygments==2.8.0
 PyQt5-stubs==5.15.2.0
 typed-ast==1.4.2
 typing-extensions==3.7.4.3
+zipp==3.4.0
diff --git a/misc/requirements/requirements-mypy.txt-raw b/misc/requirements/requirements-mypy.txt-raw
index 49bc22b51..e93eaae0b 100644
--- a/misc/requirements/requirements-mypy.txt-raw
+++ b/misc/requirements/requirements-mypy.txt-raw
@@ -1,5 +1,8 @@
 mypy
 lxml  # For HTML reports
 diff-cover
-importlib_resources  # So stubs are available even on newer Python versions
 PyQt5-stubs
+
+# So stubs are available even on newer Python versions
+importlib_resources
+importlib_metadata
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index 63e6945e6..21ec26400 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -10,7 +10,13 @@ Pygments  # For :view-source --pygments or on QtWebKit
 colorama  # Colored log output on Windows
 adblock  # Improved adblocking
 
+# Optional, only relevant when installing PyQt5/PyQtWebEngine via pip.
+importlib-metadata  # Determining PyQt version
+typing_extensions  # from importlib-metadata
+
 #@ markers: importlib-resources python_version<"3.9"
+#@ markers: importlib-metadata python_version<"3.8"
+#@ markers: typing_extensions python_version<"3.8"
 #@ markers: dataclasses python_version<"3.7"
 
 # https://github.com/ArniDagur/python-adblock/issues/28
diff --git a/requirements.txt b/requirements.txt
index f9eb8a915..410b296ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,8 +3,11 @@
 adblock==0.4.2 ; python_version!="3.10"
 colorama==0.4.4
 dataclasses==0.6 ; python_version<"3.7"
+importlib-metadata==3.7.0 ; python_version<"3.8"
 importlib-resources==5.1.0 ; python_version<"3.9"
 Jinja2==2.11.3
 MarkupSafe==1.1.1
 Pygments==2.8.0
 PyYAML==5.4.1
+typing-extensions==3.7.4.3
+zipp==3.4.0
diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py
index 9a28420ce..8fd23b3f2 100644
--- a/scripts/dev/recompile_requirements.py
+++ b/scripts/dev/recompile_requirements.py
@@ -175,6 +175,8 @@ CHANGELOG_URLS = {
     'pyroma': 'https://github.com/regebro/pyroma/blob/master/HISTORY.txt',
     'adblock': 'https://github.com/ArniDagur/python-adblock/blob/master/CHANGELOG.md',
     'importlib-resources': 'https://importlib-resources.readthedocs.io/en/latest/history.html',
+    'importlib-metadata': 'https://github.com/python/importlib_metadata/blob/main/CHANGES.rst',
+    'zipp': 'https://github.com/jaraco/zipp/blob/main/CHANGES.rst',
     'dataclasses': 'https://github.com/ericvsmith/dataclasses#release-history',
     'pip': 'https://pip.pypa.io/en/stable/news/',
     'wheel': 'https://wheel.readthedocs.io/en/stable/news.html',