diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 80202bebfab..17de147a6b6 100644 --- a/.pre-commit-config.yaml +++ b/.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: diff --git a/requirements/base.in b/requirements/base.in index f2b8a7c4403..30482c5f826 100644 --- a/requirements/base.in +++ b/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 diff --git a/requirements/base.txt b/requirements/base.txt index c8b9c69b012..cbab2a8bb62 100644 --- a/requirements/base.txt +++ b/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 diff --git a/requirements/development.txt b/requirements/development.txt index 3a62a283865..c4c9aec2a65 100644 --- a/requirements/development.txt +++ b/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 diff --git a/requirements/integration.in b/requirements/integration.in index 1bc94c7fb71..305d55a8ab0 100644 --- a/requirements/integration.in +++ b/requirements/integration.in @@ -20,3 +20,4 @@ tox py>=1.10.0 click==7.1.2 packaging==21.0 +pyparsing==2.4.7 diff --git a/requirements/integration.txt b/requirements/integration.txt index b7da99e3da3..0cceda20be0 100644 --- a/requirements/integration.txt +++ b/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 diff --git a/requirements/testing.txt b/requirements/testing.txt index 00492fb58dd..68c47b05c6f 100644 --- a/requirements/testing.txt +++ b/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 diff --git a/setup.py b/setup.py index 42eedd36deb..1dae60db497 100644 --- a/setup.py +++ b/setup.py @@ -102,6 +102,7 @@ setup( "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 diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js index 14e0ce31462..a4d3fbaa815 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js +++ b/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() diff --git a/tests/unit_tests/sql_parse_tests.py b/tests/unit_tests/sql_parse_tests.py index 36ab75df851..410e55229d4 100644 --- a/tests/unit_tests/sql_parse_tests.py +++ b/tests/unit_tests/sql_parse_tests.py @@ -19,7 +19,6 @@ import unittest from typing import Set import pytest -import sqlparse from superset.exceptions import QueryClauseValidationException from superset.sql_parse import ( @@ -949,9 +948,6 @@ INSERT INTO TABLE (foo) VALUES (42); def test_is_select_cte_with_comments() -> None: - """ - Some CTES with comments are not correctly identified as SELECTS. - """ sql = ParsedQuery( """WITH blah AS (SELECT * FROM core_dev.manager_team),