chore: add release to pip requirements

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
     rev: v0.910
     hooks:
       - id: mypy
-        additional_dependencies: [types-all]
+        additional_dependencies: [types-all, types-redis]
   - repo: https://github.com/peterdemin/pip-compile-multi
     rev: v2.4.1
     hooks:

requirements/base.in

@@ -19,3 +19,7 @@
 pyrsistent>=0.16.1,<0.17
 zipp==3.4.1
 sasl==0.3.1
+packaging==21.0
+wrapt==1.12.1
+certifi==2021.5.30
+charset-normalizer==2.0.4

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:04efc15075d69b1a2b5fa6c76b84c77a2f5c04e3
+# SHA1:fe363b0ea02d7589c2ba5a1cf936247a966a6d5e
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -35,10 +35,18 @@ cachelib==0.1.1
     # via apache-superset
 celery==4.4.7
     # via apache-superset
+certifi==2021.5.30
+    # via
+    #   -r requirements/base.in
+    #   requests
 cffi==1.14.6
     # via cryptography
 chardet==4.0.0
     # via aiohttp
+charset-normalizer==2.0.4
+    # via
+    #   -r requirements/base.in
+    #   requests
 click==7.1.2
     # via
     #   apache-superset
@@ -118,6 +126,7 @@ humanize==3.11.0
 idna==3.2
     # via
     #   email-validator
+    #   requests
     #   yarl
 isodate==0.6.0
     # via apache-superset
@@ -166,6 +175,7 @@ numpy==1.21.1
     #   pyarrow
 packaging==21.0
     # via
+    #   -r requirements/base.in
     #   bleach
     #   deprecation
 pandas==1.2.5
@@ -226,6 +236,8 @@ pyyaml==5.4.1
     #   apispec
 redis==3.5.3
     # via apache-superset
+requests==2.26.0
+    # via apache-superset
 sasl==0.3.1
     # via -r requirements/base.in
 selenium==3.141.0
@@ -270,7 +282,9 @@ typing-extensions==3.10.0.0
     #   aiohttp
     #   apache-superset
 urllib3==1.26.6
-    # via selenium
+    # via
+    #   requests
+    #   selenium
 vine==1.3.0
     # via
     #   amqp
@@ -281,6 +295,8 @@ werkzeug==1.0.1
     # via
     #   flask
     #   flask-jwt-extended
+wrapt==1.12.1
+    # via -r requirements/base.in
 wtforms==2.3.3
     # via
     #   flask-wtf

requirements/development.txt

@@ -16,10 +16,6 @@ botocore==1.21.19
     #   s3transfer
 cached-property==1.5.2
     # via tableschema
-certifi==2021.5.30
-    # via requests
-charset-normalizer==2.0.4
-    # via requests
 et-xmlfile==1.1.0
     # via openpyxl
 flask-cors==3.0.10
@@ -54,11 +50,6 @@ pyhive[hive]==0.6.4
     # via -r requirements/development.in
 pyinstrument==4.0.2
     # via -r requirements/development.in
-requests==2.26.0
-    # via
-    #   pydruid
-    #   tableschema
-    #   tabulator
 rfc3986==1.5.0
     # via tableschema
 s3transfer==0.5.0

requirements/integration.in

@@ -20,3 +20,4 @@ tox
 py>=1.10.0
 click==7.1.2
 packaging==21.0
+pyparsing==2.4.7

requirements/integration.txt

@@ -1,4 +1,4 @@
-# SHA1:17ab2346746deadfc557e1df96014e77c8337f4b
+# SHA1:32bae3a7c758a411c20c86ff4d5bff825be46314
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -45,7 +45,9 @@ py==1.10.0
     #   -r requirements/integration.in
     #   tox
 pyparsing==2.4.7
-    # via packaging
+    # via
+    #   -r requirements/integration.in
+    #   packaging
 pyyaml==5.4.1
     # via pre-commit
 six==1.16.0

requirements/testing.txt

@@ -92,8 +92,6 @@ wcwidth==0.2.5
     # via prompt-toolkit
 websocket-client==1.2.0
     # via docker
-wrapt==1.12.1
-    # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

setup.py

@@ -102,6 +102,7 @@ def get_git_sha() -> str:
         "pyyaml>=5.4",
         "PyJWT>=1.7.1, <2",
         "redis",
+        "requests==2.26.0",
         "selenium>=3.141.0",
         "simplejson>=3.15.0",
         "slackclient==2.5.0",  # PINNED! slack changes file upload api in the future versions

superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js

@@ -67,7 +67,7 @@ describe('Dashboard save action', () => {
     // should load chart
     WORLD_HEALTH_CHARTS.forEach(waitForChartLoad);
 
-    // remove box_plot chart from dashboard
+    // remove treemap chart from dashboard
     cy.get('[aria-label="edit-alt"]').click({ timeout: 5000 });
     cy.get('[data-test="dashboard-delete-component-button"]')
       .last()

superset/common/query_object.py

@@ -25,8 +25,6 @@
 from superset import app, db
 from superset.connectors.base.models import BaseDatasource
 from superset.connectors.connector_registry import ConnectorRegistry
-from superset.exceptions import QueryObjectValidationError
-from superset.typing import Metric, OrderBy
 from superset.exceptions import (
     QueryClauseValidationException,
     QueryObjectValidationError,

superset/config.py

@@ -38,7 +38,6 @@
 from flask import Blueprint
 from flask_appbuilder.security.manager import AUTH_DB
 from pandas.io.parsers import STR_NA_VALUES
-from typing_extensions import Literal
 from werkzeug.local import LocalProxy
 
 from superset.jinja_context import BaseTemplateProcessor

superset/connectors/sqla/models.py

@@ -1452,7 +1452,9 @@ def _get_top_groups(
                 # string into a timestamp.
                 if column_map[dimension].is_temporal and isinstance(value, str):
                     dttm = dateutil.parser.parse(value)
-                    value = text(self.db_engine_spec.convert_dttm("TIMESTAMP", dttm))
+                    value = text(
+                        str(self.db_engine_spec.convert_dttm("TIMESTAMP", dttm))
+                    )
 
                 group.append(groupby_exprs[dimension] == value)
             groups.append(and_(*group))

superset/db_engine_specs/postgres.py

@@ -32,7 +32,7 @@
 )
 
 from flask_babel import gettext as __
-from pytz import _FixedOffset  # type: ignore
+from pytz import _FixedOffset
 from sqlalchemy.dialects.postgresql import ARRAY, DOUBLE_PRECISION, ENUM, JSON
 from sqlalchemy.dialects.postgresql.base import PGInspector
 from sqlalchemy.types import String, TypeEngine

superset/utils/async_query_manager.py

@@ -199,9 +199,5 @@ def update_job(
         logger.debug("********** logging event data to stream %s", scoped_stream_name)
         logger.debug(event_data)
 
-        self._redis.xadd(  # type: ignore
-            scoped_stream_name, event_data, "*", self._stream_limit
-        )
-        self._redis.xadd(  # type: ignore
-            full_stream_name, event_data, "*", self._stream_limit_firehose
-        )
+        self._redis.xadd(scoped_stream_name, event_data, "*", self._stream_limit)
+        self._redis.xadd(full_stream_name, event_data, "*", self._stream_limit_firehose)

tests/integration_tests/charts/api_tests.py

@@ -2118,5 +2118,3 @@ def test_chart_data_virtual_table_with_colons(self):
         assert "':asdf'" in result["query"]
         assert "':xyz:qwerty'" in result["query"]
         assert "':qwerty:'" in result["query"]
-
-