Replace use of Setuptools pkg_resources by stdlib importlib.resources

hartwork · Oct 16, 2024 · 6d9570f · 6d9570f
1 parent 0f06aea
commit 6d9570f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 27 deletions.
diff --git a/directory_bootstrap/distros/alpine.py b/directory_bootstrap/distros/alpine.py
@@ -1,3 +1,4 @@
+import importlib.resources
 import os
 import re
 import shutil
@@ -7,7 +8,6 @@
 import directory_bootstrap.resources.alpine as resources
 from directory_bootstrap.distros.base import DirectoryBootstrapper
 from directory_bootstrap.shared.commands import COMMAND_GPG, COMMAND_UNSHARE
-from directory_bootstrap.shared.loaders._pkg_resources import resource_filename
 
 
 SUPPORTED_ARCHITECTURES = ('i686', 'x86_64')
@@ -94,8 +94,9 @@ def run(self):
  abs_temp_dir = os.path.abspath(tempfile.mkdtemp())
  try:
  abs_gpg_home_dir = self._initialize_gpg_home(abs_temp_dir)
- release_pubring_gpg = resource_filename(resources.__name__,
- 'ncopa.asc')
+ release_pubring_gpg = str(importlib.resources
+ .files(resources.__name__)
+ .joinpath("ncopa.asc"))
  self._import_gpg_key_file(abs_gpg_home_dir, release_pubring_gpg)
  self._verify_file_gpg(abs_filename_tarball,
  abs_filename_signature, abs_gpg_home_dir)

diff --git a/directory_bootstrap/distros/arch.py b/directory_bootstrap/distros/arch.py
@@ -17,7 +17,6 @@
 from directory_bootstrap.shared.commands import (
  COMMAND_CHROOT, COMMAND_MOUNT, COMMAND_TAR,
  COMMAND_UMOUNT, COMMAND_UNSHARE)
-from directory_bootstrap.shared.loaders._pkg_resources import resource_filename
 from directory_bootstrap.shared.mount import try_unmounting
 from directory_bootstrap.shared.resolv_conf import filter_copy_resolv_conf
 

diff --git a/directory_bootstrap/distros/gentoo.py b/directory_bootstrap/distros/gentoo.py
@@ -5,6 +5,7 @@
 
 import datetime
 import errno
+import importlib.resources
 import os
 import re
 import shutil
@@ -19,7 +20,6 @@
 from directory_bootstrap.shared.commands import (
  COMMAND_GPG, COMMAND_MD5SUM, COMMAND_SHA512SUM, COMMAND_TAR,
  COMMAND_UNXZ)
-from directory_bootstrap.shared.loaders._pkg_resources import resource_filename
 from directory_bootstrap.tools.stage3_latest_parser import \
  find_latest_stage3_date
 
@@ -296,7 +296,9 @@ def _initialize_gpg_home(self, abs_temp_dir):
  ('2C13823B8237310FA213034930D132FF0FF50EEB', 'Gentoo Authority Key L2 for Developers', '2019-04-01', '2020-07-01'),
  ]
  for signature in signatures:
- filename = resource_filename(resources.__name__, '{}.asc'.format(signature[0]))
+ filename = str(importlib.resources
+ .files(resources.__name__)
+ .joinpath('{}.asc'.format(signature[0])))
  cmd = self._get_gpg_argv_start(abs_gpg_home_dir) + [
  '--import', filename,
  ]

diff --git a/directory_bootstrap/shared/loaders/_pkg_resources.py b/directory_bootstrap/shared/loaders/_pkg_resources.py
diff --git a/image_bootstrap/distros/arch.py b/image_bootstrap/distros/arch.py
@@ -6,8 +6,6 @@
 import os
 from textwrap import dedent
 
-from pkg_resources import resource_filename
-
 from directory_bootstrap.distros.arch import (
  SUPPORTED_ARCHITECTURES, ArchBootstrapper)
 from directory_bootstrap.shared.commands import (