diff --git a/kfp/v2/google/client/client.py b/kfp/v2/google/client/client.py index fa96cdcd3c3..66d041052dc 100644 --- a/kfp/v2/google/client/client.py +++ b/kfp/v2/google/client/client.py @@ -15,7 +15,10 @@ import datetime import json -import pkg_resources +try: + import pkg_resources +except: + print("pkg_resources not found; upgrade to importlib.resources instead") import re import subprocess import warnings @@ -187,9 +190,14 @@ def __init__( self._region = region self._parent = _PARENT_PATTERN.format(project_id, region) - discovery_doc_path = pkg_resources.resource_filename( - 'kfp.v2.google.client', - 'discovery/aiplatform_public_google_rest_v1beta1.json') + + try: + discovery_doc_path = pkg_resources.resource_filename( + 'kfp.v2.google.client', + 'discovery/aiplatform_public_google_rest_v1beta1.json') + except: + print("pkg_resources not found; upgrade to importlib.resources instead.") + raise with open(discovery_doc_path) as f: discovery_doc = f.read() diff --git a/metaflow/__init__.py b/metaflow/__init__.py index 75ef534fea6..213d6efa75d 100644 --- a/metaflow/__init__.py +++ b/metaflow/__init__.py @@ -187,10 +187,10 @@ class and related decorators. pass del globals()["_n"] -import pkg_resources +from importlib.metadata import version try: - __version__ = pkg_resources.get_distribution("metaflow").version + __version__ = version("metaflow") except: # this happens on remote environments since the job package # does not have a version diff --git a/metaflow/_vendor/click/decorators.py b/metaflow/_vendor/click/decorators.py index c7b5af6cc57..7af3fd8ba43 100644 --- a/metaflow/_vendor/click/decorators.py +++ b/metaflow/_vendor/click/decorators.py @@ -283,7 +283,8 @@ def callback(ctx, param, value): try: import pkg_resources except ImportError: - pass + print("pkg_resources not found; upgrade to importlib.resources instead") + raise else: for dist in pkg_resources.working_set: scripts = dist.get_entry_map().get("console_scripts") or {} diff --git a/metaflow/metaflow_config.py b/metaflow/metaflow_config.py index 6d335505ee3..fb1a7a9c691 100644 --- a/metaflow/metaflow_config.py +++ b/metaflow/metaflow_config.py @@ -4,7 +4,7 @@ import sys import types -import pkg_resources +from importlib.metadata import version from metaflow.exception import MetaflowException @@ -306,7 +306,7 @@ def filter(self, record): def get_version(pkg): - return pkg_resources.get_distribution(pkg).version + return version(pkg) # PINNED_CONDA_LIBS are the libraries that metaflow depends on for execution