From c61492e3aa47e54253b0486b617a3e1b438ca382 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 23 Jan 2026 14:46:45 -0600 Subject: [PATCH] Stop importing deprecated pkg_resources module --- build/templates/__init__.py.mako | 26 +++++++++-------------- generated/nidcpower/nidcpower/__init__.py | 25 +++++++++------------- generated/nidigital/nidigital/__init__.py | 25 +++++++++------------- generated/nidmm/nidmm/__init__.py | 25 +++++++++------------- generated/nifake/nifake/__init__.py | 25 +++++++++------------- generated/nifgen/nifgen/__init__.py | 25 +++++++++------------- generated/nimodinst/nimodinst/__init__.py | 25 +++++++++------------- generated/nirfsg/nirfsg/__init__.py | 25 +++++++++------------- generated/niscope/niscope/__init__.py | 25 +++++++++------------- generated/nise/nise/__init__.py | 25 +++++++++------------- generated/niswitch/niswitch/__init__.py | 25 +++++++++------------- generated/nitclk/nitclk/__init__.py | 25 +++++++++------------- 12 files changed, 120 insertions(+), 181 deletions(-) diff --git a/build/templates/__init__.py.mako b/build/templates/__init__.py.mako index e6fc5f4fa..3cb4473dc 100644 --- a/build/templates/__init__.py.mako +++ b/build/templates/__init__.py.mako @@ -107,22 +107,16 @@ def get_diagnostic_information(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - ## TODO (ni-jfitzger): Delete use of pkg_resources when we drop Python 3.9 support. See https://github.com/ni/nimi-python/issues/2047 - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nidcpower/nidcpower/__init__.py b/generated/nidcpower/nidcpower/__init__.py index 4d1314902..3cd181349 100644 --- a/generated/nidcpower/nidcpower/__init__.py +++ b/generated/nidcpower/nidcpower/__init__.py @@ -64,21 +64,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nidigital/nidigital/__init__.py b/generated/nidigital/nidigital/__init__.py index f389587d3..760ce4f5c 100644 --- a/generated/nidigital/nidigital/__init__.py +++ b/generated/nidigital/nidigital/__init__.py @@ -58,21 +58,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nidmm/nidmm/__init__.py b/generated/nidmm/nidmm/__init__.py index 771af0160..764cad5c7 100644 --- a/generated/nidmm/nidmm/__init__.py +++ b/generated/nidmm/nidmm/__init__.py @@ -56,21 +56,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nifake/nifake/__init__.py b/generated/nifake/nifake/__init__.py index ffb333f18..e67195e4f 100644 --- a/generated/nifake/nifake/__init__.py +++ b/generated/nifake/nifake/__init__.py @@ -68,21 +68,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nifgen/nifgen/__init__.py b/generated/nifgen/nifgen/__init__.py index a8202c2dd..1b089a037 100644 --- a/generated/nifgen/nifgen/__init__.py +++ b/generated/nifgen/nifgen/__init__.py @@ -56,21 +56,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nimodinst/nimodinst/__init__.py b/generated/nimodinst/nimodinst/__init__.py index 37a2dd9a3..834ac1229 100644 --- a/generated/nimodinst/nimodinst/__init__.py +++ b/generated/nimodinst/nimodinst/__init__.py @@ -54,21 +54,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nirfsg/nirfsg/__init__.py b/generated/nirfsg/nirfsg/__init__.py index 4d8d355c0..9ad6710c1 100644 --- a/generated/nirfsg/nirfsg/__init__.py +++ b/generated/nirfsg/nirfsg/__init__.py @@ -55,21 +55,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/niscope/niscope/__init__.py b/generated/niscope/niscope/__init__.py index a8d64956f..7d80224e5 100644 --- a/generated/niscope/niscope/__init__.py +++ b/generated/niscope/niscope/__init__.py @@ -62,21 +62,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nise/nise/__init__.py b/generated/nise/nise/__init__.py index f16702cb2..c33bde766 100644 --- a/generated/nise/nise/__init__.py +++ b/generated/nise/nise/__init__.py @@ -55,21 +55,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/niswitch/niswitch/__init__.py b/generated/niswitch/niswitch/__init__.py index 93fda6d87..316d5acd2 100644 --- a/generated/niswitch/niswitch/__init__.py +++ b/generated/niswitch/niswitch/__init__.py @@ -56,21 +56,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version() diff --git a/generated/nitclk/nitclk/__init__.py b/generated/nitclk/nitclk/__init__.py index f5f6b751d..6d52a31cc 100644 --- a/generated/nitclk/nitclk/__init__.py +++ b/generated/nitclk/nitclk/__init__.py @@ -64,21 +64,16 @@ def is_venv(): else: raise SystemError('Unsupported platform: {}'.format(platform.system())) - if sys.version_info[1] >= 10: - installed_packages_names = [ - name - for name_list in importlib.metadata.packages_distributions().values() - for name in name_list - ] - installed_packages_names = set(installed_packages_names) - installed_packages_list = [ - {'name': name, 'version': importlib.metadata.distribution(name).version} - for name in sorted(installed_packages_names) - ] - else: - import pkg_resources - installed_packages = pkg_resources.working_set - installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages] + installed_packages_names = [ + name + for name_list in importlib.metadata.packages_distributions().values() + for name in name_list + ] + installed_packages_names = set(installed_packages_names) + installed_packages_list = [ + {'name': name, 'version': importlib.metadata.distribution(name).version} + for name in sorted(installed_packages_names) + ] info['os']['name'] = os_name info['os']['version'] = platform.version()