From efefb66c2de15b66af0c18a2e70910e29ce9447c Mon Sep 17 00:00:00 2001
From: Elizabeth Thompson <eschutho@gmail.com>
Date: Fri, 28 Oct 2022 18:15:15 -0700
Subject: [PATCH] chore: bump pyathena and related packages (#21958)

---
 requirements/base.txt        | 15 ++++++---------
 requirements/development.txt |  2 ++
 requirements/testing.txt     |  2 ++
 setup.py                     |  5 ++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 905f4e1ed..8387d380b 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -14,8 +14,7 @@ amqp==5.1.0
 apispec[yaml]==3.3.2
     # via flask-appbuilder
 attrs==21.2.0
-    # via
-    #   jsonschema
+    # via jsonschema
 babel==2.9.1
     # via flask-babel
 backoff==1.11.1
@@ -115,13 +114,14 @@ gunicorn==20.1.0
     # via apache-superset
 hashids==1.3.1
     # via apache-superset
+hijri-converter==2.2.4
+    # via holidays
 holidays==0.16.0
     # via apache-superset
 humanize==3.11.0
     # via apache-superset
 idna==3.2
-    # via
-    #   email-validator
+    # via email-validator
 isodate==0.6.0
     # via apache-superset
 itsdangerous==2.1.1
@@ -214,7 +214,6 @@ pytz==2021.3
     # via
     #   babel
     #   celery
-    #   convertdate
     #   flask-babel
     #   pandas
 pyyaml==5.4.1
@@ -232,16 +231,14 @@ six==1.16.0
     #   bleach
     #   click-repl
     #   flask-talisman
-    #   holidays
     #   isodate
     #   jsonschema
     #   polyline
     #   prison
     #   pyrsistent
     #   python-dateutil
-    #   sqlalchemy-utils
     #   wtforms-json
-slack_sdk==3.18.3
+slack-sdk==3.18.3
     # via apache-superset
 sqlalchemy==1.4.36
     # via
@@ -259,7 +256,7 @@ sqlparse==0.4.3
     # via apache-superset
 tabulate==0.8.9
     # via apache-superset
-typing-extensions==3.10.0.0
+typing-extensions==4.4.0
     # via apache-superset
 urllib3==1.26.6
     # via selenium
diff --git a/requirements/development.txt b/requirements/development.txt
index 5fc11b914..9990012ab 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -28,6 +28,8 @@ certifi==2021.10.8
     # via requests
 chardet==4.0.0
     # via tabulator
+charset-normalizer==2.0.12
+    # via requests
 decorator==5.1.1
     # via ipython
 et-xmlfile==1.1.0
diff --git a/requirements/testing.txt b/requirements/testing.txt
index f1ceac3b8..191fa99c0 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -111,6 +111,8 @@ pydata-google-auth==1.2.0
     # via pandas-gbq
 pyfakefs==4.5.6
     # via -r requirements/testing.in
+pyhive[presto]==0.6.5
+    # via apache-superset
 pylint==2.9.6
     # via -r requirements/testing.in
 pytest==6.2.4
diff --git a/setup.py b/setup.py
index 405346e45..cad76a957 100644
--- a/setup.py
+++ b/setup.py
@@ -119,12 +119,11 @@ setup(
         "sqlalchemy-utils>=0.38.3, <0.39",
         "sqlparse>=0.4.3, <0.5",
         "tabulate>=0.8.9, <0.9",
-        # needed to support Literal (3.8) and TypeGuard (3.10)
-        "typing-extensions>=3.10, <4",
+        "typing-extensions>=4, <5",
         "wtforms-json",
     ],
     extras_require={
-        "athena": ["pyathena>=1.10.8, <1.11"],
+        "athena": ["pyathena[pandas]>=2, <3"],
         "aurora-data-api": ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"],
         "bigquery": [
             "pandas_gbq>=0.10.0",