From 157c4e348f649db35b28664d69084c47f1b1e454 Mon Sep 17 00:00:00 2001 From: Stefan Binder Date: Tue, 1 Aug 2023 15:39:12 +0200 Subject: [PATCH] MAINT: Use importlib.metadata and packaging instead of deprecated pkg_resources (#3133) * MAINT: Use importlib.metadata and packaging instead of deprecated pkg_resources * Consolidate importlib.metadata imports --- altair/utils/data.py | 32 ++++++++++++++++---------------- pyproject.toml | 3 ++- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/altair/utils/data.py b/altair/utils/data.py index 64bf782f4..a836d0a64 100644 --- a/altair/utils/data.py +++ b/altair/utils/data.py @@ -3,12 +3,14 @@ import random import hashlib import warnings +from importlib.metadata import version as importlib_version, PackageNotFoundError from typing import Union, MutableMapping, Optional, Dict, Sequence, TYPE_CHECKING, List from types import ModuleType import pandas as pd from toolz import curried from typing import TypeVar +from packaging.version import Version from .core import sanitize_dataframe, sanitize_arrow_table, _DataFrameLike from .core import sanitize_geo_interface @@ -349,25 +351,23 @@ def curry(*args, **kwargs): def import_pyarrow_interchange() -> ModuleType: - import pkg_resources - try: - pkg_resources.require("pyarrow>=11.0.0") - # The package is installed and meets the minimum version requirement - import pyarrow.interchange as pi - - return pi - except pkg_resources.DistributionNotFound as err: - # The package is not installed - raise ImportError( - "Usage of the DataFrame Interchange Protocol requires the package 'pyarrow', but it is not installed." - ) from err - except pkg_resources.VersionConflict as err: - # The package is installed but does not meet the minimum version requirement + pyarrow_version_str = importlib_version("pyarrow") + except PackageNotFoundError as err: raise ImportError( - "The installed version of 'pyarrow' does not meet the minimum requirement of version 11.0.0. " - "Please update 'pyarrow' to use the DataFrame Interchange Protocol." + "Usage of the DataFrame Interchange Protocol requires the package" + + " 'pyarrow', but it is not installed." ) from err + else: + if Version(pyarrow_version_str) < Version("11.0.0"): + raise ImportError( + "The installed version of 'pyarrow' does not meet the minimum requirement of version 11.0.0. " + "Please update 'pyarrow' to use the DataFrame Interchange Protocol." + ) + else: + import pyarrow.interchange as pi + + return pi def pyarrow_available() -> bool: diff --git a/pyproject.toml b/pyproject.toml index cb0d58944..fe61b78ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,8 @@ dependencies = [ "numpy", # If you update the minimum required pandas version, also update it in build.yml "pandas>=0.25", - "toolz" + "toolz", + "packaging" ] description = "Vega-Altair: A declarative statistical visualization library for Python." readme = "README.md"