From bb5ac5cc6b1b00ee52b21ff2698166f7d22c9206 Mon Sep 17 00:00:00 2001 From: matei0494 Date: Tue, 10 Feb 2026 15:49:42 +0200 Subject: [PATCH] pkg_resources fix --- src/ops/__init__.py | 11 ++++++++--- src/ops/cli/terraform.py | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ops/__init__.py b/src/ops/__init__.py index 45672d9d..66778ce1 100644 --- a/src/ops/__init__.py +++ b/src/ops/__init__.py @@ -8,7 +8,6 @@ # OF ANY KIND, either express or implied. See the License for the specific language # governing permissions and limitations under the License. -import pkg_resources import re from distutils.version import StrictVersion from subprocess import call, Popen, PIPE @@ -16,11 +15,17 @@ from six import PY3 from .cli import display +try: + from importlib import metadata as importlib_metadata +except ImportError: + import importlib_metadata def validate_ops_version(min_ops_version): - current_ops_version = [ - x.version for x in pkg_resources.working_set if x.project_name == "ops-cli"][0] + try: + current_ops_version = importlib_metadata.version("ops-cli") + except Exception: + raise Exception("Cannot determine current ops-cli version from installed metadata.") if StrictVersion(current_ops_version) < StrictVersion(min_ops_version): raise Exception("The current ops version {0} is lower than the minimum required version {1}. " "Please upgrade by following the instructions seen here: " diff --git a/src/ops/cli/terraform.py b/src/ops/cli/terraform.py index 9d5e5c75..4c241163 100644 --- a/src/ops/cli/terraform.py +++ b/src/ops/cli/terraform.py @@ -17,7 +17,6 @@ from ops.hierarchical.composition_config_generator import TerraformConfigGenerator from distutils.version import StrictVersion from ops import validate_ops_version -import pkg_resources logger = logging.getLogger(__name__)