Skip to content

Commit 593b4a0

Browse files
authored
Merge pull request #8 from Kitware/avoid-pkg-resources
fix: avoid pkg_resources for get_trame_versions()
2 parents 4648a2c + 49010b3 commit 593b4a0

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

trame_vuetify/ui/vuetify.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010

1111

1212
def get_trame_versions():
13-
import pkg_resources
13+
import importlib.metadata
14+
from trame_client.utils.version import get_version
1415

1516
output = []
16-
for pkg in pkg_resources.working_set:
17-
if pkg.key.startswith("trame"):
18-
output.append(f"{pkg.key.replace('trame-', '')} == {pkg.version}")
17+
for pkg in importlib.metadata.distributions():
18+
name = pkg.metadata["Name"]
19+
if name.startswith("trame"):
20+
version = get_version(name)
21+
output.append(f"{name.replace('trame-', '')} == {version}")
1922

2023
return "\n".join(output)
2124

trame_vuetify/ui/vuetify3.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010

1111

1212
def get_trame_versions():
13-
import pkg_resources
13+
import importlib.metadata
14+
from trame_client.utils.version import get_version
1415

1516
output = []
16-
for pkg in pkg_resources.working_set:
17-
if pkg.key.startswith("trame"):
18-
output.append(f"{pkg.key.replace('trame-', '')} == {pkg.version}")
17+
for pkg in importlib.metadata.distributions():
18+
name = pkg.metadata["Name"]
19+
if name.startswith("trame"):
20+
version = get_version(name)
21+
output.append(f"{name.replace('trame-', '')} == {version}")
1922

2023
return "\n".join(output)
2124

0 commit comments

Comments
 (0)