Skip to content

Commit

Permalink
Merge pull request #136 from treasure-data/no-pkg-resources
Browse files Browse the repository at this point in the history
Use importlib.metadata instead of pkg_resources since deprecated
  • Loading branch information
chezou authored Aug 28, 2024
2 parents cfaf362 + f624ac8 commit 55f7aef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 2 additions & 3 deletions pytd/__init__.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
7 changes: 4 additions & 3 deletions pytd/query_engine.py
Original file line number Diff line number Diff line change
@@ -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__)

Expand Down Expand Up @@ -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}

Expand Down

0 comments on commit 55f7aef

Please sign in to comment.