From f624ac8ef1fa23e4ed3245a6f56e622027cd4026 Mon Sep 17 00:00:00 2001 From: Aki Ariga Date: Mon, 26 Aug 2024 23:03:08 -0700 Subject: [PATCH] Use importlib.metadata instead of pkg_resources since deprecated See: https://setuptools.pypa.io/en/latest/pkg_resources.html --- pytd/__init__.py | 5 ++--- pytd/query_engine.py | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytd/__init__.py b/pytd/__init__.py index 0bacdf6..a953f21 100644 --- a/pytd/__init__.py +++ b/pytd/__init__.py @@ -1,10 +1,9 @@ +import importlib.metadata import logging -import pkg_resources - from .client import Client -__version__ = pkg_resources.get_distribution("pytd").version +__version__ = importlib.metadata.version("pytd") logger = logging.getLogger(__name__) logger.addHandler(logging.StreamHandler()) logger.setLevel(logging.INFO) diff --git a/pytd/query_engine.py b/pytd/query_engine.py index 77ec5cc..b91ab99 100644 --- a/pytd/query_engine.py +++ b/pytd/query_engine.py @@ -1,13 +1,13 @@ import abc +import importlib.metadata import logging import os from urllib.parse import urlparse -import pkg_resources import prestodb import tdclient -__version__ = pkg_resources.get_distribution("pytd").version +__version__ = importlib.metadata.version("pytd") logger = logging.getLogger(__name__) @@ -95,7 +95,8 @@ def execute(self, query, **kwargs): cur = self.cursor(**kwargs) self.executed = cur.execute(query) rows = cur.fetchall() - # cur.description is None for CREATE and DROP statements in recent version of Trino + # cur.description is None for CREATE and DROP statements in recent version of + # Trino columns = [desc[0] for desc in cur.description] if cur.description else None return {"data": rows, "columns": columns}