Skip to content

dim/models: replace deprecated pkg_resources #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miesi-ionos merged 1 commit into from
Aug 21, 2025
Merged

dim/models: replace deprecated pkg_resources #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions dim/dim/models/migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import subprocess
from collections import deque

import pkg_resources
import importlib.resources

from dim.models import SchemaInfo, SCHEMA_VERSION, db

Expand Down Expand Up @@ -38,11 +38,11 @@ def migrate():

def gather_graph():
graph = {}
for script in pkg_resources.resource_listdir('dim', 'sql'):
m = re.match(r'(migrate|rollback)_(.*)_to_(.*).sql', script)
for script in importlib.resources.files("dim").joinpath("sql").iterdir():
m = re.match(r'(migrate|rollback)_(.*)_to_(.*).sql', script.name)
if m:
x, y = m.group(2), m.group(3)
graph.setdefault(x, []).append((y, script))
graph.setdefault(x, []).append((y, script.name))
return graph


Expand All @@ -59,5 +59,7 @@ def run_script(new_version, script):
cmd.append('-u%s' % url.username)
if url.password:
cmd.append('-p%s' % url.password)
stdin = open(pkg_resources.resource_filename('dim', 'sql/' + script))
subprocess.check_call(cmd, stdin=stdin)
ref = importlib.resources.files("dim") / "sql" / script
with importlib.resources.as_file(ref) as path:
with open(path) as stdin:
subprocess.check_call(cmd, stdin=stdin)