launchpad-reviewers team mailing list archive

[Alvaro Crespo Serrano <mp+478068@xxxxxxxxxxxxxxxxxx>]

Alvaro Crespo Serrano has proposed merging ~alvarocs/launchpad:remove-importlib-resources into launchpad:master.

Commit message:
Remove unused importlib-resources

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~alvarocs/launchpad/+git/launchpad/+merge/478068

Remove importlib-resources as it was only needed for Python < 3.7, but now we are on Python 3.8.

Removed from:
 - setup.cfg and requirements/launchpad.txt
 - codebase
 - lp-source-dependencies (in another MP https://code.launchpad.net/~alvarocs/lp-source-dependencies/+git/lp-source-dependencies/+merge/478077)
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~alvarocs/launchpad:remove-importlib-resources into launchpad:master.

diff --git a/lib/lp/buildmaster/tests/mock_workers.py b/lib/lp/buildmaster/tests/mock_workers.py
index 5f5563b..3464537 100644
--- a/lib/lp/buildmaster/tests/mock_workers.py
+++ b/lib/lp/buildmaster/tests/mock_workers.py
@@ -22,13 +22,9 @@ import shlex
 import sys
 import xmlrpc.client
 from collections import OrderedDict
+from importlib import resources
 from textwrap import dedent
 
-try:
-    from importlib import resources
-except ImportError:
-    import importlib_resources as resources  # type: ignore
-
 import fixtures
 from testtools.content import attach_file
 from twisted.internet import defer
diff --git a/lib/lp/services/webservice/wadl.py b/lib/lp/services/webservice/wadl.py
index 830743b..6a60ebe 100644
--- a/lib/lp/services/webservice/wadl.py
+++ b/lib/lp/services/webservice/wadl.py
@@ -3,12 +3,8 @@
 
 """APIs to generate the web service WADL and documentation HTML."""
 
-try:
-    from importlib import resources
-except ImportError:
-    import importlib_resources as resources
-
 import subprocess
+from importlib import resources
 from urllib.parse import urljoin
 
 from lp.services.webapp.interaction import ANONYMOUS, setupInteractionByEmail
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 9a6542f..8c05d7e 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -61,7 +61,6 @@ hyperlink==18.0.0
 immutables==0.14
 importlib==1.0.2
 importlib-metadata==8.5.0
-importlib-resources==0.5
 incremental==21.3.0
 ipython==7.9.0
 ipython-genutils==0.2.0
diff --git a/setup.cfg b/setup.cfg
index bbba1a2..8cf3c6c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,7 +34,6 @@ install_requires =
     fixtures
     geoip2
     gunicorn
-    importlib-resources; python_version < "3.7"
     ipython
     Jinja2
     jsautobuild