From 1649c6fe1990367c73b600c445fb266ac0a9c102 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 7 Dec 2020 12:37:42 -0500
Subject: Migrate read_file from pkg_resources to importlib.resources

In python 3.9, we can get any resource from a package subdirectory using
files(), but on older versions of python, even where importlib.resources exists,
we need the backport.
---
 README.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 5437036be..6ab9784a8 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -131,6 +131,8 @@ The following software and libraries are required to run qutebrowser:
 * http://pygments.org/[pygments]
 * https://github.com/yaml/pyyaml[PyYAML]
 * https://www.attrs.org/[attrs]
+* https://importlib-resources.readthedocs.io/[importlib_resources] (on python
+  3.8 or older)
 
 The following libraries are optional:
 
-- 
cgit v1.2.3-54-g00ecf


From ed99cf123aaf27963f74074c2509b0c369232656 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 8 Dec 2020 22:21:13 +0100
Subject: Update docs

---
 README.asciidoc        |  5 +++--
 doc/changelog.asciidoc | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 6ab9784a8..5c254959e 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -125,13 +125,14 @@ The following software and libraries are required to run qutebrowser:
     sensitive data.**
 * https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.12.0 or newer
   for Python 3
-* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
+* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools] (being
+  phased out for qutebrowser v2.0.0)
 * https://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
 * http://pygments.org/[pygments]
 * https://github.com/yaml/pyyaml[PyYAML]
 * https://www.attrs.org/[attrs]
-* https://importlib-resources.readthedocs.io/[importlib_resources] (on python
+* https://importlib-resources.readthedocs.io/[importlib_resources] (on Python
   3.8 or older)
 
 The following libraries are optional:
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 9f8cc9736..5a0ce3938 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -42,6 +42,12 @@ Major changes
   still relying on it. The `cssutils` project is also dead upstream, with its
   repository being gone after Bitbucket
   https://bitbucket.org/blog/sunsetting-mercurial-support-in-bitbucket[removed Mercurial support].
+- TODO: The former dependency on the `pkg_resources` module (part of the
+  `setuptools` project) got dropped.
+- A new dependency on the `importlib_resources` module got introduced for
+  Python versions up to and including 3.8. Note that the stdlib
+  `importlib.resources` module for Python 3.7 and 3.8 is missing the needed APIs,
+  thus requiring the backports for those versions as well.
 
 Removed
 ~~~~~~~
@@ -107,6 +113,10 @@ Fixed
   `colors.downloads.*`), the alpha channel is now handled correctly.
 - The `format_json` userscript now uses `env` in its shebang, making it work
   correctly on systems where `bash` isn't located in `/bin`.
+- TODO: Due to a long-standing bug in the `pkg_resources` dependency, it caused
+  qutebrowser's startup to slow down by around 150ms-1s (heavily depending on
+  the system). Since the dependency is now removed, qutebrowser's startup time
+  thus improved.
 
 v1.14.1 (2020-12-04)
 --------------------
-- 
cgit v1.2.3-54-g00ecf

