Skip to content

Commit c61492e

Browse files
ni-jfitzgerni-jfitzger
committed
Stop importing deprecated pkg_resources module
1 parent fb4aee8 commit c61492e

12 files changed

Lines changed: 120 additions & 181 deletions

File tree

‎build/templates/__init__.py.mako‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,16 @@ def get_diagnostic_information():
107107
else:
108108
raise SystemError('Unsupported platform: {}'.format(platform.system()))
109109

110-
if sys.version_info[1] >= 10:
111-
installed_packages_names = [
112-
name
113-
for name_list in importlib.metadata.packages_distributions().values()
114-
for name in name_list
115-
]
116-
installed_packages_names = set(installed_packages_names)
117-
installed_packages_list = [
118-
{'name': name, 'version': importlib.metadata.distribution(name).version}
119-
for name in sorted(installed_packages_names)
120-
]
121-
## TODO (ni-jfitzger): Delete use of pkg_resources when we drop Python 3.9 support. See https://github.com/ni/nimi-python/issues/2047
122-
else:
123-
import pkg_resources
124-
installed_packages = pkg_resources.working_set
125-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
110+
installed_packages_names = [
111+
name
112+
for name_list in importlib.metadata.packages_distributions().values()
113+
for name in name_list
114+
]
115+
installed_packages_names = set(installed_packages_names)
116+
installed_packages_list = [
117+
{'name': name, 'version': importlib.metadata.distribution(name).version}
118+
for name in sorted(installed_packages_names)
119+
]
126120

127121
info['os']['name'] = os_name
128122
info['os']['version'] = platform.version()

‎generated/nidcpower/nidcpower/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,16 @@ def is_venv():
6464
else:
6565
raise SystemError('Unsupported platform: {}'.format(platform.system()))
6666

67-
if sys.version_info[1] >= 10:
68-
installed_packages_names = [
69-
name
70-
for name_list in importlib.metadata.packages_distributions().values()
71-
for name in name_list
72-
]
73-
installed_packages_names = set(installed_packages_names)
74-
installed_packages_list = [
75-
{'name': name, 'version': importlib.metadata.distribution(name).version}
76-
for name in sorted(installed_packages_names)
77-
]
78-
else:
79-
import pkg_resources
80-
installed_packages = pkg_resources.working_set
81-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
67+
installed_packages_names = [
68+
name
69+
for name_list in importlib.metadata.packages_distributions().values()
70+
for name in name_list
71+
]
72+
installed_packages_names = set(installed_packages_names)
73+
installed_packages_list = [
74+
{'name': name, 'version': importlib.metadata.distribution(name).version}
75+
for name in sorted(installed_packages_names)
76+
]
8277

8378
info['os']['name'] = os_name
8479
info['os']['version'] = platform.version()

‎generated/nidigital/nidigital/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,16 @@ def is_venv():
5858
else:
5959
raise SystemError('Unsupported platform: {}'.format(platform.system()))
6060

61-
if sys.version_info[1] >= 10:
62-
installed_packages_names = [
63-
name
64-
for name_list in importlib.metadata.packages_distributions().values()
65-
for name in name_list
66-
]
67-
installed_packages_names = set(installed_packages_names)
68-
installed_packages_list = [
69-
{'name': name, 'version': importlib.metadata.distribution(name).version}
70-
for name in sorted(installed_packages_names)
71-
]
72-
else:
73-
import pkg_resources
74-
installed_packages = pkg_resources.working_set
75-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
61+
installed_packages_names = [
62+
name
63+
for name_list in importlib.metadata.packages_distributions().values()
64+
for name in name_list
65+
]
66+
installed_packages_names = set(installed_packages_names)
67+
installed_packages_list = [
68+
{'name': name, 'version': importlib.metadata.distribution(name).version}
69+
for name in sorted(installed_packages_names)
70+
]
7671

7772
info['os']['name'] = os_name
7873
info['os']['version'] = platform.version()

‎generated/nidmm/nidmm/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,16 @@ def is_venv():
5656
else:
5757
raise SystemError('Unsupported platform: {}'.format(platform.system()))
5858

59-
if sys.version_info[1] >= 10:
60-
installed_packages_names = [
61-
name
62-
for name_list in importlib.metadata.packages_distributions().values()
63-
for name in name_list
64-
]
65-
installed_packages_names = set(installed_packages_names)
66-
installed_packages_list = [
67-
{'name': name, 'version': importlib.metadata.distribution(name).version}
68-
for name in sorted(installed_packages_names)
69-
]
70-
else:
71-
import pkg_resources
72-
installed_packages = pkg_resources.working_set
73-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
59+
installed_packages_names = [
60+
name
61+
for name_list in importlib.metadata.packages_distributions().values()
62+
for name in name_list
63+
]
64+
installed_packages_names = set(installed_packages_names)
65+
installed_packages_list = [
66+
{'name': name, 'version': importlib.metadata.distribution(name).version}
67+
for name in sorted(installed_packages_names)
68+
]
7469

7570
info['os']['name'] = os_name
7671
info['os']['version'] = platform.version()

‎generated/nifake/nifake/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,16 @@ def is_venv():
6868
else:
6969
raise SystemError('Unsupported platform: {}'.format(platform.system()))
7070

71-
if sys.version_info[1] >= 10:
72-
installed_packages_names = [
73-
name
74-
for name_list in importlib.metadata.packages_distributions().values()
75-
for name in name_list
76-
]
77-
installed_packages_names = set(installed_packages_names)
78-
installed_packages_list = [
79-
{'name': name, 'version': importlib.metadata.distribution(name).version}
80-
for name in sorted(installed_packages_names)
81-
]
82-
else:
83-
import pkg_resources
84-
installed_packages = pkg_resources.working_set
85-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
71+
installed_packages_names = [
72+
name
73+
for name_list in importlib.metadata.packages_distributions().values()
74+
for name in name_list
75+
]
76+
installed_packages_names = set(installed_packages_names)
77+
installed_packages_list = [
78+
{'name': name, 'version': importlib.metadata.distribution(name).version}
79+
for name in sorted(installed_packages_names)
80+
]
8681

8782
info['os']['name'] = os_name
8883
info['os']['version'] = platform.version()

‎generated/nifgen/nifgen/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,16 @@ def is_venv():
5656
else:
5757
raise SystemError('Unsupported platform: {}'.format(platform.system()))
5858

59-
if sys.version_info[1] >= 10:
60-
installed_packages_names = [
61-
name
62-
for name_list in importlib.metadata.packages_distributions().values()
63-
for name in name_list
64-
]
65-
installed_packages_names = set(installed_packages_names)
66-
installed_packages_list = [
67-
{'name': name, 'version': importlib.metadata.distribution(name).version}
68-
for name in sorted(installed_packages_names)
69-
]
70-
else:
71-
import pkg_resources
72-
installed_packages = pkg_resources.working_set
73-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
59+
installed_packages_names = [
60+
name
61+
for name_list in importlib.metadata.packages_distributions().values()
62+
for name in name_list
63+
]
64+
installed_packages_names = set(installed_packages_names)
65+
installed_packages_list = [
66+
{'name': name, 'version': importlib.metadata.distribution(name).version}
67+
for name in sorted(installed_packages_names)
68+
]
7469

7570
info['os']['name'] = os_name
7671
info['os']['version'] = platform.version()

‎generated/nimodinst/nimodinst/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,16 @@ def is_venv():
5454
else:
5555
raise SystemError('Unsupported platform: {}'.format(platform.system()))
5656

57-
if sys.version_info[1] >= 10:
58-
installed_packages_names = [
59-
name
60-
for name_list in importlib.metadata.packages_distributions().values()
61-
for name in name_list
62-
]
63-
installed_packages_names = set(installed_packages_names)
64-
installed_packages_list = [
65-
{'name': name, 'version': importlib.metadata.distribution(name).version}
66-
for name in sorted(installed_packages_names)
67-
]
68-
else:
69-
import pkg_resources
70-
installed_packages = pkg_resources.working_set
71-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
57+
installed_packages_names = [
58+
name
59+
for name_list in importlib.metadata.packages_distributions().values()
60+
for name in name_list
61+
]
62+
installed_packages_names = set(installed_packages_names)
63+
installed_packages_list = [
64+
{'name': name, 'version': importlib.metadata.distribution(name).version}
65+
for name in sorted(installed_packages_names)
66+
]
7267

7368
info['os']['name'] = os_name
7469
info['os']['version'] = platform.version()

‎generated/nirfsg/nirfsg/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,16 @@ def is_venv():
5555
else:
5656
raise SystemError('Unsupported platform: {}'.format(platform.system()))
5757

58-
if sys.version_info[1] >= 10:
59-
installed_packages_names = [
60-
name
61-
for name_list in importlib.metadata.packages_distributions().values()
62-
for name in name_list
63-
]
64-
installed_packages_names = set(installed_packages_names)
65-
installed_packages_list = [
66-
{'name': name, 'version': importlib.metadata.distribution(name).version}
67-
for name in sorted(installed_packages_names)
68-
]
69-
else:
70-
import pkg_resources
71-
installed_packages = pkg_resources.working_set
72-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
58+
installed_packages_names = [
59+
name
60+
for name_list in importlib.metadata.packages_distributions().values()
61+
for name in name_list
62+
]
63+
installed_packages_names = set(installed_packages_names)
64+
installed_packages_list = [
65+
{'name': name, 'version': importlib.metadata.distribution(name).version}
66+
for name in sorted(installed_packages_names)
67+
]
7368

7469
info['os']['name'] = os_name
7570
info['os']['version'] = platform.version()

‎generated/niscope/niscope/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,16 @@ def is_venv():
6262
else:
6363
raise SystemError('Unsupported platform: {}'.format(platform.system()))
6464

65-
if sys.version_info[1] >= 10:
66-
installed_packages_names = [
67-
name
68-
for name_list in importlib.metadata.packages_distributions().values()
69-
for name in name_list
70-
]
71-
installed_packages_names = set(installed_packages_names)
72-
installed_packages_list = [
73-
{'name': name, 'version': importlib.metadata.distribution(name).version}
74-
for name in sorted(installed_packages_names)
75-
]
76-
else:
77-
import pkg_resources
78-
installed_packages = pkg_resources.working_set
79-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
65+
installed_packages_names = [
66+
name
67+
for name_list in importlib.metadata.packages_distributions().values()
68+
for name in name_list
69+
]
70+
installed_packages_names = set(installed_packages_names)
71+
installed_packages_list = [
72+
{'name': name, 'version': importlib.metadata.distribution(name).version}
73+
for name in sorted(installed_packages_names)
74+
]
8075

8176
info['os']['name'] = os_name
8277
info['os']['version'] = platform.version()

‎generated/nise/nise/__init__.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,16 @@ def is_venv():
5555
else:
5656
raise SystemError('Unsupported platform: {}'.format(platform.system()))
5757

58-
if sys.version_info[1] >= 10:
59-
installed_packages_names = [
60-
name
61-
for name_list in importlib.metadata.packages_distributions().values()
62-
for name in name_list
63-
]
64-
installed_packages_names = set(installed_packages_names)
65-
installed_packages_list = [
66-
{'name': name, 'version': importlib.metadata.distribution(name).version}
67-
for name in sorted(installed_packages_names)
68-
]
69-
else:
70-
import pkg_resources
71-
installed_packages = pkg_resources.working_set
72-
installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
58+
installed_packages_names = [
59+
name
60+
for name_list in importlib.metadata.packages_distributions().values()
61+
for name in name_list
62+
]
63+
installed_packages_names = set(installed_packages_names)
64+
installed_packages_list = [
65+
{'name': name, 'version': importlib.metadata.distribution(name).version}
66+
for name in sorted(installed_packages_names)
67+
]
7368

7469
info['os']['name'] = os_name
7570
info['os']['version'] = platform.version()

0 commit comments

Comments
 (0)