Skip to content

Commit 5885914

Browse files
avoid deprecated resourcelib
1 parent b5e03d1 commit 5885914

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

vinca/generate_azure.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66
import os
77
import argparse
8-
import pkg_resources
8+
from importlib import resources
99
from distutils.dir_util import copy_tree
1010

1111
from rich import print
@@ -23,9 +23,7 @@
2323

2424

2525
def read_azure_script(fn):
26-
template_in = pkg_resources.resource_filename("vinca", f"azure_templates/{fn}")
27-
with open(template_in, "r") as fi:
28-
return fi.read()
26+
return (resources.files("vinca") / "azure_templates" / fn).read_text()
2927

3028

3129
azure_linux_script = lu(read_azure_script("linux.sh"))

vinca/generate_gha.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66
import os
77
import argparse
8-
import pkg_resources
8+
from importlib import resources
99
from distutils.dir_util import copy_tree
1010

1111
from rich import print
@@ -22,10 +22,9 @@
2222
from vinca import config
2323

2424

25+
2526
def read_azure_script(fn):
26-
template_in = pkg_resources.resource_filename("vinca", f"azure_templates/{fn}")
27-
with open(template_in, "r") as fi:
28-
return fi.read()
27+
return (resources.files("vinca") / "azure_templates" / fn).read_text(encoding="utf-8")
2928

3029

3130
azure_unix_script = lu(read_azure_script("unix.sh"))

vinca/template.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import datetime
2+
from importlib import resources
23
import shutil
34
import os
45
import re
@@ -241,7 +242,7 @@ def generate_build_script_for_recipe(
241242
script_name, output_path, additional_cmake_args="", additional_folder=""
242243
):
243244
"""Generate a specific build script directly in the recipe directory."""
244-
import pkg_resources
245+
from importlib import resources
245246

246247
# Map script names to their template files
247248
script_templates = {
@@ -256,9 +257,7 @@ def generate_build_script_for_recipe(
256257
}
257258

258259
if script_name in script_templates:
259-
template_in = pkg_resources.resource_filename(
260-
"vinca", script_templates[script_name]
261-
)
260+
template_in = resources.files("vinca") / script_templates[script_name]
262261
with open(output_path, "w") as output_file:
263262
extra_globals = {}
264263
if additional_cmake_args:
@@ -284,7 +283,7 @@ def generate_build_script_for_recipe(
284283

285284
def generate_activation_scripts_for_recipe(recipe_dir):
286285
"""Generate activation scripts directly in the recipe directory."""
287-
import pkg_resources
286+
from importlib import resources
288287

289288
activation_templates = {
290289
"activate.sh": "templates/activate.sh.in",
@@ -296,7 +295,7 @@ def generate_activation_scripts_for_recipe(recipe_dir):
296295
}
297296

298297
for script_name, template_path in activation_templates.items():
299-
template_in = pkg_resources.resource_filename("vinca", template_path)
298+
template_in = resources.files("vinca") / template_path
300299
output_path = recipe_dir / script_name
301300
with open(output_path, "w") as output_file:
302301
generate_template(

0 commit comments

Comments
 (0)