From 4b6721c21240634d583b2d653100d029346da695 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 14 Jan 2026 18:16:13 +0100 Subject: [PATCH 1/2] Replace pkg_resources with packaging/importlib --- ue4cli/PluginManager.py | 4 ++-- ue4cli/UnrealManagerDarwin.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ue4cli/PluginManager.py b/ue4cli/PluginManager.py index e157394..951de2b 100644 --- a/ue4cli/PluginManager.py +++ b/ue4cli/PluginManager.py @@ -1,5 +1,5 @@ from inspect import signature -import pkg_resources +from importlib.metadata import entry_points class PluginManager: """ @@ -16,7 +16,7 @@ def getPlugins(): plugins = { entry_point.name: entry_point.load() for entry_point - in pkg_resources.iter_entry_points('ue4cli.plugins') + in entry_points('ue4cli.plugins') } # Filter out any invalid plugins diff --git a/ue4cli/UnrealManagerDarwin.py b/ue4cli/UnrealManagerDarwin.py index 3208d43..d10f0a4 100644 --- a/ue4cli/UnrealManagerDarwin.py +++ b/ue4cli/UnrealManagerDarwin.py @@ -2,7 +2,7 @@ from .UnrealManagerException import UnrealManagerException from .UnrealManagerUnix import UnrealManagerUnix from .Utility import Utility -from pkg_resources import parse_version +from packaging import version import glob, os class UnrealManagerDarwin(UnrealManagerUnix): @@ -34,16 +34,16 @@ def _detectEngineRoot(self): return None def _editorPathSuffix(self, cmdVersion): - version = parse_version(self.getEngineVersion()) - if version < parse_version('5.0.0'): + version = version.parse(self.getEngineVersion()) + if version < version.parse('5.0.0'): return '.app/Contents/MacOS/UE4Editor' else: return '.app/Contents/MacOS/UnrealEditor' def _transformBuildToolPlatform(self, platform): # Prior to 4.22.2, Build.sh under Mac requires "macosx" as the platform name for macOS - version = parse_version(self.getEngineVersion()) - return 'macosx' if platform == 'Mac' and version < parse_version('4.22.2') else platform + version = version.parse(self.getEngineVersion()) + return 'macosx' if platform == 'Mac' and version < version.parse('4.22.2') else platform def _getRunXBuildScript(self): xbuildScript = super(UnrealManagerDarwin, self)._getRunXBuildScript() From 38c9b5cdbc432379ba1c101b7629e15cb7fa50f5 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 14 Jan 2026 18:23:32 +0100 Subject: [PATCH 2/2] Fix entry_points() call --- ue4cli/PluginManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ue4cli/PluginManager.py b/ue4cli/PluginManager.py index 951de2b..796b963 100644 --- a/ue4cli/PluginManager.py +++ b/ue4cli/PluginManager.py @@ -16,7 +16,7 @@ def getPlugins(): plugins = { entry_point.name: entry_point.load() for entry_point - in entry_points('ue4cli.plugins') + in entry_points(group='ue4cli.plugins') } # Filter out any invalid plugins