replaced deprecated pkg_resources with importlib

oasys-kit · Jan 20, 2025 · 9633a52 · 9633a52
1 parent 67ea078
commit 9633a52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/oasys/application/addons.py b/oasys/application/addons.py
@@ -639,8 +639,10 @@ def set_packages(self, installable):
         # 17 Jan 2025: replaced pkg_resources with importlib (for now the third party version)
         #              because of deprecation
         #dists = {dist.project_name: dist for dist in installed}
-        try:    dists = {dist.name: dist for dist in installed}
-        except: dists = {dist.project_name: dist for dist in installed}
+        dists = {}
+        for dist in installed:
+            try:    dists[dist.project_name] = dist
+            except: dists[dist.name] = dist
         packages = {pkg.name: pkg for pkg in packages}
 
         # For every pypi available distribution not listed by
@@ -934,8 +936,11 @@ def installable_items(pypipackages, installed=[]):
     """
     # 17 Jan 2025: replaced pkg_resources with importlib (for now the third party version)
     #              because of deprecation
-    #dists = {dist.project_name: dist for dist in installed}
-    dists = {dist.name: dist for dist in installed}
+    # dists = {dist.project_name: dist for dist in installed}
+    dists = {}
+    for dist in installed:
+        try:    dists[dist.project_name] =  dist
+        except: dists[dist.name]         =  dist
     packages = {pkg.name: pkg for pkg in pypipackages}
 
     # For every pypi available distribution not listed by

diff --git a/oasys/application/internal_libraries.py b/oasys/application/internal_libraries.py
@@ -465,8 +465,10 @@ def set_packages(self, installable):
         # 17 Jan 2025: replaced pkg_resources with importlib (for now the third party version)
         #              because of deprecation
         #dists = {dist.project_name: dist for dist in installed}
-        try:    dists = {dist.name: dist for dist in installed}
-        except: dists = {dist.project_name: dist for dist in installed}
+        dists = {}
+        for dist in installed:
+            try:    dists[dist.project_name] = dist
+            except: dists[dist.name] = dist
         packages = {pkg.name: pkg for pkg in packages}
 
         # For every pypi available distribution not listed by