Improving Pytest and Tox settings.

igorborgest · igorborgest · commit 5b05099197f4 · 2020-08-06T11:39:53.000-03:00
diff --git a/awswrangler/s3/_write_parquet.py b/awswrangler/s3/_write_parquet.py
@@ -339,7 +339,7 @@ def to_parquet(  # pylint: disable=too-many-arguments,too-many-locals
     # Evaluating dtype
     catalog_table_input: Optional[Dict[str, Any]] = None
     if database is not None and table is not None:
-        catalog_table_input: Optional[Dict[str, Any]] = catalog._get_table_input(  # pylint: disable=protected-access
+        catalog_table_input = catalog._get_table_input(  # pylint: disable=protected-access
             database=database, table=table, boto3_session=session, catalog_id=catalog_id
         )
     df = _apply_dtype(df=df, dtype=dtype, catalog_table_input=catalog_table_input, mode=mode)
diff --git a/awswrangler/s3/_write_text.py b/awswrangler/s3/_write_text.py
@@ -334,7 +334,7 @@ def to_csv(  # pylint: disable=too-many-arguments,too-many-locals
     # Evaluating dtype
     catalog_table_input: Optional[Dict[str, Any]] = None
     if database is not None and table is not None:
-        catalog_table_input: Optional[Dict[str, Any]] = catalog._get_table_input(  # pylint: disable=protected-access
+        catalog_table_input = catalog._get_table_input(  # pylint: disable=protected-access
             database=database, table=table, boto3_session=session, catalog_id=catalog_id
         )
     df = _apply_dtype(df=df, dtype=dtype, catalog_table_input=catalog_table_input, mode=mode)
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,8 @@
+[pytest]
+log_cli=False
+filterwarnings =
+    ignore::DeprecationWarning
+addopts =
+    --log-cli-format "[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s"
+    --verbose
+    --capture=sys
diff --git a/setup.cfg b/setup.cfg
@@ -7,15 +7,6 @@ license_files =
 [flake8]
 max-line-length = 120
 
-[tool:pytest]
-log_cli=False
-filterwarnings =
-    ignore::DeprecationWarning
-addopts =
-    --log-cli-format "[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s"
-    --verbose
-    --capture=sys
-
 [isort]
 multi_line_output=3
 include_trailing_comma=True
diff --git a/tests/test__routines.py b/tests/test__routines.py
@@ -5,9 +5,7 @@
 
 import awswrangler as wr
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize("use_threads", [True, False])
diff --git a/tests/test_athena.py b/tests/test_athena.py
@@ -21,9 +21,7 @@
     get_time_str_with_random_suffix,
 )
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_athena_ctas(path, path2, path3, glue_table, glue_table2, glue_database, kms_key):
diff --git a/tests/test_athena_cache.py b/tests/test_athena_cache.py
@@ -7,9 +7,7 @@
 
 from ._utils import ensure_athena_query_metadata
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_athena_cache(path, glue_database, glue_table, workgroup1):
diff --git a/tests/test_athena_csv.py b/tests/test_athena_csv.py
@@ -7,9 +7,7 @@
 
 from ._utils import ensure_data_types_csv, get_df_csv
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize("use_threads", [True, False])
diff --git a/tests/test_athena_parquet.py b/tests/test_athena_parquet.py
@@ -9,9 +9,7 @@
 
 from ._utils import ensure_data_types, get_df, get_df_cast, get_df_list
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_parquet_catalog(path, path2, glue_table, glue_table2, glue_database):
diff --git a/tests/test_athena_projection.py b/tests/test_athena_projection.py
@@ -6,9 +6,7 @@
 
 from ._utils import dt, ts
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_to_parquet_projection_integer(glue_database, glue_table, path):
diff --git a/tests/test_cloudwatch.py b/tests/test_cloudwatch.py
@@ -6,9 +6,7 @@
 import awswrangler as wr
 from awswrangler import exceptions
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_query_cancelled(loggroup):
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -10,9 +10,7 @@
 
 import awswrangler as wr
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_basics(path, glue_database, glue_table):
diff --git a/tests/test_db.py b/tests/test_db.py
@@ -13,9 +13,7 @@
 
 from ._utils import dt, ensure_data_types, ensure_data_types_category, get_df, get_df_category, ts
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize("db_type", ["mysql", "redshift", "postgresql"])
diff --git a/tests/test_emr.py b/tests/test_emr.py
@@ -5,9 +5,7 @@
 
 import awswrangler as wr
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_cluster(bucket, cloudformation_outputs):
diff --git a/tests/test_moto.py b/tests/test_moto.py
@@ -15,9 +15,7 @@
 
 from ._utils import ensure_data_types, get_df_csv, get_df_list
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/test_quicksight.py b/tests/test_quicksight.py
@@ -4,9 +4,7 @@
 
 from ._utils import get_df_quicksight
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_quicksight(path, glue_database, glue_table):
diff --git a/tests/test_s3.py b/tests/test_s3.py
@@ -13,9 +13,7 @@
 
 API_CALL = botocore.client.BaseClient._make_api_call
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize("sanitize_columns,col", [(True, "foo_boo"), (False, "FooBoo")])
diff --git a/tests/test_s3_parquet.py b/tests/test_s3_parquet.py
@@ -7,9 +7,7 @@
 
 import awswrangler as wr
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize("partition_cols", [None, ["c2"], ["c1", "c2"]])
diff --git a/tests/test_s3_text.py b/tests/test_s3_text.py
@@ -12,9 +12,7 @@
 
 from ._utils import get_df_csv
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_session.py b/tests/test_session.py
@@ -4,9 +4,7 @@
 
 import awswrangler as wr
 
-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")
 logging.getLogger("awswrangler").setLevel(logging.DEBUG)
-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)
 
 
 def test_default_session():

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ def to_parquet( # pylint: disable=too-many-arguments,too-many-locals`
`339`	`339`	`# Evaluating dtype`
`340`	`340`	`catalog_table_input: Optional[Dict[str, Any]] = None`
`341`	`341`	`if database is not None and table is not None:`
`342`		`- catalog_table_input: Optional[Dict[str, Any]] = catalog._get_table_input( # pylint: disable=protected-access`
	`342`	`+ catalog_table_input = catalog._get_table_input( # pylint: disable=protected-access`
`343`	`343`	`database=database, table=table, boto3_session=session, catalog_id=catalog_id`
`344`	`344`	`)`
`345`	`345`	`df = _apply_dtype(df=df, dtype=dtype, catalog_table_input=catalog_table_input, mode=mode)`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ def to_csv( # pylint: disable=too-many-arguments,too-many-locals`
`334`	`334`	`# Evaluating dtype`
`335`	`335`	`catalog_table_input: Optional[Dict[str, Any]] = None`
`336`	`336`	`if database is not None and table is not None:`
`337`		`- catalog_table_input: Optional[Dict[str, Any]] = catalog._get_table_input( # pylint: disable=protected-access`
	`337`	`+ catalog_table_input = catalog._get_table_input( # pylint: disable=protected-access`
`338`	`338`	`database=database, table=table, boto3_session=session, catalog_id=catalog_id`
`339`	`339`	`)`
`340`	`340`	`df = _apply_dtype(df=df, dtype=dtype, catalog_table_input=catalog_table_input, mode=mode)`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,7 @@`
`21`	`21`	`get_time_str_with_random_suffix,`
`22`	`22`	`)`
`23`	`23`
`24`		`-logging.basicConfig(level=logging.INFO, format="[%(asctime)s][%(levelname)s][%(name)s][%(funcName)s] %(message)s")`
`25`	`24`	`logging.getLogger("awswrangler").setLevel(logging.DEBUG)`
`26`		`-logging.getLogger("botocore.credentials").setLevel(logging.CRITICAL)`
`27`	`25`
`28`	`26`
`29`	`27`	`def test_athena_ctas(path, path2, path3, glue_table, glue_table2, glue_database, kms_key):`