Update requirements

apache · Aug 5, 2020 · 8fee355 · 8fee355
1 parent 2e1c8a8
commit 8fee355
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/docker/requirements-extra.txt b/docker/requirements-extra.txt
@@ -17,5 +17,3 @@
 gevent==1.4.0
 psycopg2-binary==2.8.5
 redis==3.2.1
-# support multi insert, needed to load examples into presto
-PyHive==0.6.3.dev0
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -16,8 +16,8 @@ babel==2.8.0              # via flask-babel
 backoff==1.10.0           # via apache-superset
 billiard==3.6.3.0         # via celery
 bleach==3.1.5             # via apache-superset
-boto3==1.14.34            # via tabulator
-botocore==1.17.34         # via boto3, s3transfer
+boto3==1.14.36            # via tabulator
+botocore==1.17.36         # via boto3, s3transfer
 brotli==1.0.7             # via flask-compress
 cached-property==1.5.1    # via tableschema
 cachelib==0.1.1           # via apache-superset
@@ -55,9 +55,8 @@ geographiclib==1.50       # via geopy
 geopy==2.0.0              # via apache-superset
 gunicorn==20.0.4          # via apache-superset
 humanize==2.5.0           # via apache-superset
-idna-ssl==1.1.0           # via aiohttp
-idna==2.10                # via email-validator, idna-ssl, requests, yarl
-ijson==3.1.post0          # via tabulator
+idna==2.10                # via email-validator, requests, yarl
+ijson==3.1.1              # via tabulator
 importlib-metadata==1.7.0  # via jsonschema, kombu, markdown
 isodate==0.6.0            # via apache-superset, tableschema
 itsdangerous==1.1.0       # via flask, flask-wtf
@@ -92,7 +91,7 @@ py==1.9.0                 # via retry
 pyarrow==0.17.1           # via apache-superset
 pycparser==2.20           # via cffi
 pydruid==0.6.1            # via apache-superset
-pyhive[hive]==0.6.2       # via apache-superset
+pyhive[hive]==0.6.3       # via apache-superset
 pyjwt==1.7.1              # via flask-appbuilder, flask-jwt-extended
 pyparsing==2.4.7          # via packaging
 pyrsistent==0.16.0        # via jsonschema
@@ -119,7 +118,7 @@ tableschema==1.19.2       # via apache-superset
 tabulator==1.52.3         # via tableschema
 thrift-sasl==0.4.2        # via pyhive
 thrift==0.13.0            # via apache-superset, pyhive, thrift-sasl
-typing-extensions==3.7.4.2  # via aiohttp, yarl
+typing-extensions==3.7.4.2  # via yarl
 unicodecsv==0.14.1        # via tableschema, tabulator
 urllib3==1.25.10          # via botocore, requests, selenium
 vine==1.3.0               # via amqp, celery

diff --git a/requirements/integration.txt b/requirements/integration.txt
@@ -12,7 +12,6 @@ distlib==0.3.1            # via virtualenv
 filelock==3.0.12          # via tox, virtualenv
 identify==1.4.25          # via pre-commit
 importlib-metadata==1.7.0  # via pluggy, pre-commit, tox, virtualenv
-importlib-resources==3.0.0  # via pre-commit, virtualenv
 nodeenv==1.4.0            # via pre-commit
 packaging==20.4           # via tox
 pip-compile-multi==1.5.8  # via -r requirements/integration.in
@@ -26,8 +25,8 @@ six==1.15.0               # via packaging, pip-tools, tox, virtualenv
 toml==0.10.1              # via pre-commit, tox
 toposort==1.5             # via pip-compile-multi
 tox==3.18.1               # via -r requirements/integration.in
-virtualenv==20.0.29       # via pre-commit, tox
-zipp==3.1.0               # via importlib-metadata, importlib-resources
+virtualenv==20.0.30       # via pre-commit, tox
+zipp==3.1.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/requirements/testing.in b/requirements/testing.in
@@ -20,6 +20,7 @@ flask-testing
 openapi-spec-validator
 openpyxl
 parameterized
+pyhive[presto]>=0.6.3
 pylint
 pytest
 pytest-cov

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -1,4 +1,4 @@
-# SHA1:785ae7ffcde3cee8ebcc0a839cdb8e61e693d329
+# SHA1:e7b15a12c98ccce1cc4b8ee977205f141201b761
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -18,6 +18,7 @@ mccabe==0.6.1             # via pylint
 more-itertools==8.4.0     # via pytest
 openapi-spec-validator==0.2.9  # via -r requirements/testing.in
 parameterized==0.7.4      # via -r requirements/testing.in
+pyhive[hive,presto]==0.6.3  # via -r requirements/testing.in, apache-superset
 pylint==2.5.3             # via -r requirements/testing.in
 pytest-cov==2.10.0        # via -r requirements/testing.in
 pytest==6.0.1             # via -r requirements/testing.in, pytest-cov

diff --git a/superset/examples/multiformat_time_series.py b/superset/examples/multiformat_time_series.py
@@ -59,8 +59,8 @@ def load_multiformat_time_series(
             if_exists="replace",
             chunksize=500,
             dtype={
-                "ds": Date if database.backend != "presto" else String(255),
-                "ds2": DateTime if datdocker/requirements-extra.txtabase.backend != "presto" else String(255),
+                "ds": String(255) if database.backend == "presto" else Date,
+                "ds2": String(255) if database.backend == "presto" else DateTime,
                 "epoch_s": BigInteger,
                 "epoch_ms": BigInteger,
                 "string0": String(100),