Bumping version to 1.5.0

igorborgest · igorborgest · commit 775781051b3f · 2020-06-13T21:49:51.000-03:00
diff --git a/README.md b/README.md
@@ -3,13 +3,13 @@
 
 ![AWS Data Wrangler](docs/source/_static/logo2.png?raw=true "AWS Data Wrangler")
 
-[![Release](https://img.shields.io/badge/release-1.4.0-brightgreen.svg)](https://pypi.org/project/awswrangler/)
+[![Release](https://img.shields.io/badge/release-1.5.0-brightgreen.svg)](https://pypi.org/project/awswrangler/)
 [![Python Version](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8-brightgreen.svg)](https://anaconda.org/conda-forge/awswrangler)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen.svg)](https://pypi.org/project/awswrangler/)
+[![Coverage](https://img.shields.io/badge/coverage-90%25-brightgreen.svg)](https://pypi.org/project/awswrangler/)
 ![Static Checking](https://github.com/awslabs/aws-data-wrangler/workflows/Static%20Checking/badge.svg?branch=master)
 [![Documentation Status](https://readthedocs.org/projects/aws-data-wrangler/badge/?version=latest)](https://aws-data-wrangler.readthedocs.io/?badge=latest)
 
diff --git a/awswrangler/__init__.py b/awswrangler/__init__.py
@@ -5,10 +5,10 @@
 
 """
 
-import logging
+import logging as _logging
 
 from awswrangler import athena, catalog, cloudwatch, db, emr, exceptions, quicksight, s3  # noqa
 from awswrangler.__metadata__ import __description__, __license__, __title__, __version__  # noqa
 from awswrangler._utils import get_account_id  # noqa
 
-logging.getLogger("awswrangler").addHandler(logging.NullHandler())
+_logging.getLogger("awswrangler").addHandler(_logging.NullHandler())
diff --git a/awswrangler/__metadata__.py b/awswrangler/__metadata__.py
@@ -7,5 +7,5 @@
 
 __title__ = "awswrangler"
 __description__ = "Pandas on AWS."
-__version__ = "1.4.0"
+__version__ = "1.5.0"
 __license__ = "Apache License 2.0"
diff --git a/awswrangler/catalog.py b/awswrangler/catalog.py
@@ -6,7 +6,7 @@
 import re
 import unicodedata
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
-from urllib.parse import quote_plus
+from urllib.parse import quote_plus as _quote_plus
 
 import boto3  # type: ignore
 import pandas as pd  # type: ignore
@@ -566,10 +566,12 @@ def get_tables(
     if catalog_id is not None:
         args["CatalogId"] = catalog_id
     if (name_prefix is not None) and (name_suffix is not None) and (name_contains is not None):
-        raise exceptions.InvalidArgumentCombination("Please, does not filter using name_contains and "
-                                                    "name_prefix/name_suffix at the same time. Only "
-                                                    "name_prefix and name_suffix can be combined together.")
-    elif (name_prefix is not None) and (name_suffix is not None):
+        raise exceptions.InvalidArgumentCombination(
+            "Please, does not filter using name_contains and "
+            "name_prefix/name_suffix at the same time. Only "
+            "name_prefix and name_suffix can be combined together."
+        )
+    if (name_prefix is not None) and (name_suffix is not None):
         args["Expression"] = f"{name_prefix}*{name_suffix}"
     elif name_contains is not None:
         args["Expression"] = f"*{name_contains}*"
@@ -665,7 +667,7 @@ def tables(
         if "Columns" in tbl["StorageDescriptor"]:
             df_dict["Columns"].append(", ".join([x["Name"] for x in tbl["StorageDescriptor"]["Columns"]]))
         else:
-            df_dict["Columns"].append("")
+            df_dict["Columns"].append("")  # pragma: no cover
         if "PartitionKeys" in tbl:
             df_dict["Partitions"].append(", ".join([x["Name"] for x in tbl["PartitionKeys"]]))
         else:
@@ -1008,8 +1010,8 @@ def get_engine(
     db_type: str = details["JDBC_CONNECTION_URL"].split(":")[1].lower()
     host: str = details["JDBC_CONNECTION_URL"].split(":")[2].replace("/", "")
     port, database = details["JDBC_CONNECTION_URL"].split(":")[3].split("/")
-    user: str = quote_plus(details["USERNAME"])
-    password: str = quote_plus(details["PASSWORD"])
+    user: str = _quote_plus(details["USERNAME"])
+    password: str = _quote_plus(details["PASSWORD"])
     if db_type == "postgresql":
         _utils.ensure_postgresql_casts()
     if db_type in ("redshift", "postgresql"):
diff --git a/awswrangler/cloudwatch.py b/awswrangler/cloudwatch.py
@@ -1,8 +1,8 @@
 """CloudWatch Logs module."""
 
+import datetime
 import logging
 import time
-from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 import boto3  # type: ignore
@@ -18,8 +18,8 @@
 def start_query(
     query: str,
     log_group_names: List[str],
-    start_time: datetime = datetime(year=1970, month=1, day=1),
-    end_time: datetime = datetime.now(),
+    start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1),
+    end_time: datetime.datetime = datetime.datetime.now(),
     limit: Optional[int] = None,
     boto3_session: Optional[boto3.Session] = None,
 ) -> str:
@@ -120,8 +120,8 @@ def wait_query(query_id: str, boto3_session: Optional[boto3.Session] = None) ->
 def run_query(
     query: str,
     log_group_names: List[str],
-    start_time: datetime = datetime(year=1970, month=1, day=1),
-    end_time: datetime = datetime.now(),
+    start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1),
+    end_time: datetime.datetime = datetime.datetime.now(),
     limit: Optional[int] = None,
     boto3_session: Optional[boto3.Session] = None,
 ) -> List[List[Dict[str, str]]]:
@@ -174,8 +174,8 @@ def run_query(
 def read_logs(
     query: str,
     log_group_names: List[str],
-    start_time: datetime = datetime(year=1970, month=1, day=1),
-    end_time: datetime = datetime.now(),
+    start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1),
+    end_time: datetime.datetime = datetime.datetime.now(),
     limit: Optional[int] = None,
     boto3_session: Optional[boto3.Session] = None,
 ) -> pd.DataFrame:
diff --git a/awswrangler/db.py b/awswrangler/db.py
@@ -4,7 +4,7 @@
 import logging
 import time
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
-from urllib.parse import quote_plus
+from urllib.parse import quote_plus as _quote_plus
 
 import boto3  # type: ignore
 import pandas as pd  # type: ignore
@@ -350,8 +350,8 @@ def get_redshift_temp_engine(
     res: Dict[str, Any] = client_redshift.get_cluster_credentials(
         DbUser=user, ClusterIdentifier=cluster_identifier, DurationSeconds=duration, AutoCreate=False
     )
-    _user: str = quote_plus(res["DbUser"])
-    password: str = quote_plus(res["DbPassword"])
+    _user: str = _quote_plus(res["DbUser"])
+    password: str = _quote_plus(res["DbPassword"])
     cluster: Dict[str, Any] = client_redshift.describe_clusters(ClusterIdentifier=cluster_identifier)["Clusters"][0]
     host: str = cluster["Endpoint"]["Address"]
     port: str = cluster["Endpoint"]["Port"]
diff --git a/awswrangler/quicksight/__init__.py b/awswrangler/quicksight/__init__.py
@@ -39,5 +39,6 @@
     list_iam_policy_assignments_for_user,
     list_ingestions,
     list_templates,
+    list_user_groups,
     list_users,
 )
diff --git a/awswrangler/quicksight/_create.py b/awswrangler/quicksight/_create.py
@@ -275,7 +275,10 @@ def create_athena_dataset(
     if ((database is None) and (table is None)) and (sql is None):
         raise exceptions.InvalidArgument("You must pass database/table OR sql argument.")
     if (database is not None) and (sql is not None):
-        raise exceptions.InvalidArgument("If you provide sql argument, please include the database name inside the sql statement. Do NOT pass in with database argument.")
+        raise exceptions.InvalidArgument(
+            "If you provide sql argument, please include the database name inside the sql statement."
+            "Do NOT pass in with database argument."
+        )
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     if account_id is None:
diff --git a/awswrangler/s3/_delete.py b/awswrangler/s3/_delete.py
@@ -1,8 +1,8 @@
 """Amazon S3 CopDeletey Module (PRIVATE)."""
 
 import concurrent.futures
+import itertools
 import logging
-from itertools import repeat
 from typing import Dict, List, Optional, Union
 
 import boto3  # type: ignore
@@ -82,4 +82,4 @@ def delete_objects(
         else:
             cpus: int = _utils.ensure_cpu_count(use_threads=use_threads)
             with concurrent.futures.ThreadPoolExecutor(max_workers=cpus) as executor:
-                list(executor.map(_delete_objects, repeat(bucket), chunks, repeat(client_s3)))
+                list(executor.map(_delete_objects, itertools.repeat(bucket), chunks, itertools.repeat(client_s3)))
diff --git a/awswrangler/s3/_describe.py b/awswrangler/s3/_describe.py
@@ -1,9 +1,9 @@
 """Amazon S3 Describe Module (INTERNAL)."""
 
 import concurrent.futures
+import itertools
 import logging
 import time
-from itertools import repeat
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import boto3  # type: ignore
@@ -94,7 +94,9 @@ def describe_objects(
     else:
         cpus: int = _utils.ensure_cpu_count(use_threads=use_threads)
         with concurrent.futures.ThreadPoolExecutor(max_workers=cpus) as executor:
-            resp_list = list(executor.map(_describe_object, paths, repeat(wait_time), repeat(client_s3)))
+            resp_list = list(
+                executor.map(_describe_object, paths, itertools.repeat(wait_time), itertools.repeat(client_s3))
+            )
     desc_dict: Dict[str, Dict[str, Any]] = dict(resp_list)
     return desc_dict
 
diff --git a/awswrangler/s3/_read.py b/awswrangler/s3/_read.py
@@ -1,8 +1,8 @@
 """Amazon S3 Read Module (PRIVATE)."""
 
 import concurrent.futures
+import itertools
 import logging
-from itertools import repeat
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
 import boto3  # type: ignore
@@ -128,13 +128,13 @@ def _read_text(
             df = pd.concat(
                 objs=executor.map(
                     _read_text_full,
-                    repeat(parser_func),
-                    repeat(path_root),
+                    itertools.repeat(parser_func),
+                    itertools.repeat(path_root),
                     paths,
-                    repeat(_utils.boto3_to_primitives(boto3_session=session)),  # Boto3.Session
-                    repeat(pandas_kwargs),
-                    repeat(s3_additional_kwargs),
-                    repeat(dataset),
+                    itertools.repeat(_utils.boto3_to_primitives(boto3_session=session)),  # Boto3.Session
+                    itertools.repeat(pandas_kwargs),
+                    itertools.repeat(s3_additional_kwargs),
+                    itertools.repeat(dataset),
                 ),
                 ignore_index=True,
                 sort=False,
diff --git a/awswrangler/s3/_wait.py b/awswrangler/s3/_wait.py
@@ -1,8 +1,8 @@
 """Amazon S3 Wait Module (PRIVATE)."""
 
 import concurrent.futures
+import itertools
 import logging
-from itertools import repeat
 from typing import List, Optional, Tuple, Union
 
 import boto3  # type: ignore
@@ -38,10 +38,10 @@ def _wait_objects(
                 executor.map(
                     _wait_objects_concurrent,
                     _paths,
-                    repeat(waiter_name),
-                    repeat(client_s3),
-                    repeat(_delay),
-                    repeat(max_attempts),
+                    itertools.repeat(waiter_name),
+                    itertools.repeat(client_s3),
+                    itertools.repeat(_delay),
+                    itertools.repeat(max_attempts),
                 )
             )
     return None
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -183,3 +183,4 @@ Amazon QuickSight
     list_ingestions
     list_templates
     list_users
+    list_user_groups
diff --git a/testing/test_awswrangler/test_data_lake.py b/testing/test_awswrangler/test_data_lake.py
@@ -1078,15 +1078,12 @@ def test_catalog(path, database, table):
         if tbl["Name"] == table:
             assert tbl["TableType"] == "EXTERNAL_TABLE"
     # prefix & suffix & name_contains
-    tables = list(
-        wr.catalog.get_tables(
-            name_prefix=table[0], name_contains=table[3], name_suffix=table[-1], catalog_id=account_id
+    with pytest.raises(wr.exceptions.InvalidArgumentCombination):
+        list(
+            wr.catalog.get_tables(
+                name_prefix=table[0], name_contains=table[3], name_suffix=table[-1], catalog_id=account_id
+            )
         )
-    )
-    assert len(tables) > 0
-    for tbl in tables:
-        if tbl["Name"] == table:
-            assert tbl["TableType"] == "EXTERNAL_TABLE"
     # prefix & suffix
     tables = list(wr.catalog.get_tables(name_prefix=table[0], name_suffix=table[-1], catalog_id=account_id))
     assert len(tables) > 0
diff --git a/testing/test_awswrangler/test_metadata.py b/testing/test_awswrangler/test_metadata.py
@@ -2,7 +2,7 @@
 
 
 def test_metadata():
-    assert wr.__version__ == "1.4.0"
+    assert wr.__version__ == "1.5.0"
     assert wr.__title__ == "awswrangler"
     assert wr.__description__ == "Pandas on AWS."
     assert wr.__license__ == "Apache License 2.0"

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@`
`39`	`39`	`list_iam_policy_assignments_for_user,`
`40`	`40`	`list_ingestions,`
`41`	`41`	`list_templates,`
	`42`	`+ list_user_groups,`
`42`	`43`	`list_users,`
`43`	`44`	`)`