From 94e98acae24e8dfbfb34d374a80082800c108788 Mon Sep 17 00:00:00 2001 From: Takuya Kitazawa Date: Fri, 25 Dec 2020 07:04:17 +0900 Subject: [PATCH 1/3] Fix lint error by formatting --- pytd/client.py | 3 +-- pytd/query_engine.py | 15 +++++---------- pytd/table.py | 3 +-- pytd/writer.py | 6 ++---- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pytd/client.py b/pytd/client.py index c50e3cc..0b23f96 100644 --- a/pytd/client.py +++ b/pytd/client.py @@ -161,8 +161,7 @@ def get_job(self, job_id): return self.api_client.job(job_id) def close(self): - """Close a client I/O session to Treasure Data. - """ + """Close a client I/O session to Treasure Data.""" self.default_engine.close() self.api_client.close() diff --git a/pytd/query_engine.py b/pytd/query_engine.py index f008a9f..0c8ee99 100644 --- a/pytd/query_engine.py +++ b/pytd/query_engine.py @@ -40,8 +40,7 @@ def __init__(self, apikey, endpoint, database, header): @property def user_agent(self): - """User agent passed to a query engine connection. - """ + """User agent passed to a query engine connection.""" return "pytd/{0}".format(__version__) def execute(self, query, **kwargs): @@ -260,8 +259,7 @@ def __init__(self, apikey, endpoint, database, header): @property def user_agent(self): - """User agent passed to a Presto connection. - """ + """User agent passed to a Presto connection.""" return "pytd/{0} (prestodb/{1}; tdclient/{2})".format( __version__, prestodb.__version__, tdclient.__version__ ) @@ -314,8 +312,7 @@ def cursor(self, force_tdclient=False, **kwargs): return self._get_tdclient_cursor(self.tdclient_connection, **kwargs) def close(self): - """Close a connection to Presto. - """ + """Close a connection to Presto.""" self.prestodb_connection.close() self.tdclient_connection.close() @@ -364,8 +361,7 @@ def __init__(self, apikey, endpoint, database, header): @property def user_agent(self): - """User agent passed to a Hive connection. - """ + """User agent passed to a Hive connection.""" return "pytd/{0} (tdclient/{1})".format(__version__, tdclient.__version__) def cursor(self, force_tdclient=True, **kwargs): @@ -408,8 +404,7 @@ def cursor(self, force_tdclient=True, **kwargs): return self._get_tdclient_cursor(self.engine, **kwargs) def close(self): - """Close a connection to Hive. - """ + """Close a connection to Hive.""" self.engine.close() def _connect(self): diff --git a/pytd/table.py b/pytd/table.py index f3c532f..7ec3d3b 100644 --- a/pytd/table.py +++ b/pytd/table.py @@ -90,8 +90,7 @@ def create(self, column_names=[], column_types=[]): self.client.api_client.create_log_table(self.database, self.table) def delete(self): - """Delete a table from Treasure Data. - """ + """Delete a table from Treasure Data.""" self.client.api_client.delete_table(self.database, self.table) def import_dataframe(self, dataframe, writer, if_exists="error", **kwargs): diff --git a/pytd/writer.py b/pytd/writer.py index 95e2066..fe72c48 100644 --- a/pytd/writer.py +++ b/pytd/writer.py @@ -44,8 +44,7 @@ def _isinstance_or_null(x, t): def _replace_pd_na(dataframe): - """Replace np.nan to None to avoid Int64 conversion issue - """ + """Replace np.nan to None to avoid Int64 conversion issue""" if dataframe.isnull().any().any(): dataframe.replace({np.nan: None}, inplace=True) @@ -679,7 +678,6 @@ def write_dataframe(self, dataframe, table, if_exists): ) def close(self): - """Close a PySpark session connected to Treasure Data. - """ + """Close a PySpark session connected to Treasure Data.""" if self.td_spark is not None: self.td_spark.spark.stop() From fd5c0c84ddd2dcaf964306f5625f0d54b991fcf6 Mon Sep 17 00:00:00 2001 From: Takuya Kitazawa Date: Fri, 25 Dec 2020 07:48:33 +0900 Subject: [PATCH 2/3] Update isort command to see diff --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 281f4c2..528a0f5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -8,7 +8,7 @@ def lint(session): session.install(*lint_tools) session.run("flake8", *targets) session.run("black", "--diff", "--check", *targets) - session.run("isort", "--check-only") + session.run("isort", "--diff", "--check", *targets) @nox.session From 4be791ac269c093ebbb12efd8bd6c111098258c6 Mon Sep 17 00:00:00 2001 From: Takuya Kitazawa Date: Fri, 25 Dec 2020 07:48:42 +0900 Subject: [PATCH 3/3] Fix isort lint errors --- pytd/spark.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pytd/spark.py b/pytd/spark.py index c5ad776..456c154 100644 --- a/pytd/spark.py +++ b/pytd/spark.py @@ -86,9 +86,9 @@ def fetch_td_spark_context( Connection of td-spark """ try: + import td_pyspark from pyspark.conf import SparkConf from pyspark.sql import SparkSession - import td_pyspark from td_pyspark import TDSparkContextBuilder except ImportError: raise RuntimeError("td_pyspark is not installed") diff --git a/setup.py b/setup.py index 8db3ea8..2b83299 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def setup_package(): - from setuptools import setup, find_packages + from setuptools import find_packages, setup metadata = dict( name=DISTNAME,