From b24323d500f1353d732f4d223733fb1832895a36 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 17:34:36 -0800 Subject: [PATCH] =?UTF-8?q?chore(=F0=9F=A6=BE):=20bump=20python=20pre-comm?= =?UTF-8?q?it=203.7.1=20->=204.0.1=20(#31050)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: GitHub Action Co-authored-by: Maxime Beauchemin --- .pre-commit-config.yaml | 12 ++++++------ requirements/development.txt | 2 +- superset/connectors/sqla/models.py | 2 +- superset/extensions/__init__.py | 2 +- superset/jinja_context.py | 3 +-- superset/models/core.py | 2 +- superset/security/manager.py | 2 +- superset/tasks/async_queries.py | 2 +- superset/utils/core.py | 5 ++--- superset/viz.py | 2 +- tests/integration_tests/conftest.py | 2 +- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cd08edcf4..07f77eb4f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,11 +16,11 @@ # repos: - repo: https://github.com/MarcoGorelli/auto-walrus - rev: v0.2.2 + rev: 0.3.4 hooks: - id: auto-walrus - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.3.0 + rev: v1.13.0 hooks: - id: mypy args: [--check-untyped-defs] @@ -39,11 +39,11 @@ repos: types-Markdown, ] - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.6.2 + rev: v2.6.4 hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: check-docstring-first - id: check-added-large-files @@ -56,7 +56,7 @@ repos: exclude: ^.*\.(snap) args: ["--markdown-linebreak-ext=md"] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.1.0 # Use the sha or tag you want to point at + rev: v4.0.0-alpha.8 # Use the sha or tag you want to point at hooks: - id: prettier additional_dependencies: @@ -70,7 +70,7 @@ repos: - id: blacklist args: ["--blacklisted-names=make_url", "--ignore=tests/"] - repo: https://github.com/norwoodj/helm-docs - rev: v1.11.0 + rev: v1.14.2 hooks: - id: helm-docs files: helm diff --git a/requirements/development.txt b/requirements/development.txt index f0e5438e4..4571a3346 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -141,7 +141,7 @@ pluggy==1.4.0 # via # pytest # tox -pre-commit==3.7.1 +pre-commit==4.0.1 # via apache-superset progress==1.6 # via apache-superset diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index fb7409adb..292a230ae 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -921,7 +921,7 @@ class TableColumn(AuditMixinNullable, ImportExportMixin, CertificationMixin, Mod @property def database(self) -> Database: - return self.table.database if self.table else self._database + return self.table.database if self.table else self._database # type: ignore @property def db_engine_spec(self) -> builtins.type[BaseEngineSpec]: diff --git a/superset/extensions/__init__.py b/superset/extensions/__init__.py index cc2106b01..3559f7ba3 100644 --- a/superset/extensions/__init__.py +++ b/superset/extensions/__init__.py @@ -85,7 +85,7 @@ class UIManifestProcessor: return { "js_manifest": lambda bundle: get_files(bundle, "js"), "css_manifest": lambda bundle: get_files(bundle, "css"), - "assets_prefix": ( + "assets_prefix": ( # type: ignore self.app.config["STATIC_ASSETS_PREFIX"] if self.app else "" ), } diff --git a/superset/jinja_context.py b/superset/jinja_context.py index 604e26b1d..b0e29505a 100644 --- a/superset/jinja_context.py +++ b/superset/jinja_context.py @@ -352,8 +352,7 @@ class ExtraCache: for flt in form_data.get("adhoc_filters", []): val: Union[Any, list[Any]] = flt.get("comparator") - op: str = flt["operator"].upper() if flt.get("operator") else None - # fltOpName: str = flt.get("filterOptionName") + op: str = flt["operator"].upper() if flt.get("operator") else None # type: ignore if ( flt.get("expressionType") == "SIMPLE" and flt.get("clause") == "WHERE" diff --git a/superset/models/core.py b/superset/models/core.py index 418141272..1baf372c5 100755 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -1055,7 +1055,7 @@ class Database(Model, AuditMixinNullable, ImportExportMixin): # pylint: disable ) def get_perm(self) -> str: - return self.perm # type: ignore + return self.perm def has_table(self, table: Table) -> bool: with self.get_sqla_engine(catalog=table.catalog, schema=table.schema) as engine: diff --git a/superset/security/manager.py b/superset/security/manager.py index 9fd84ed58..c0773f9f7 100644 --- a/superset/security/manager.py +++ b/superset/security/manager.py @@ -477,7 +477,7 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods return ( self.can_access_all_datasources() or self.can_access_all_databases() - or self.can_access("database_access", database.perm) # type: ignore + or self.can_access("database_access", database.perm) ) def can_access_catalog(self, database: "Database", catalog: str) -> bool: diff --git a/superset/tasks/async_queries.py b/superset/tasks/async_queries.py index 2fdf09484..9ee633f15 100644 --- a/superset/tasks/async_queries.py +++ b/superset/tasks/async_queries.py @@ -174,7 +174,7 @@ def load_explore_json_into_cache( # pylint: disable=too-many-locals errors = ex.errors else: error = ex.message if hasattr(ex, "message") else str(ex) - errors = [error] + errors = [error] # type: ignore async_query_manager.update_job( job_metadata, async_query_manager.STATUS_ERROR, errors=errors diff --git a/superset/utils/core.py b/superset/utils/core.py index 9480e5473..ada40053c 100644 --- a/superset/utils/core.py +++ b/superset/utils/core.py @@ -919,14 +919,13 @@ def merge_extra_form_data(form_data: dict[str, Any]) -> None: "adhoc_filters", [] ) adhoc_filters.extend( - {"isExtra": True, **adhoc_filter} # type: ignore - for adhoc_filter in append_adhoc_filters + {"isExtra": True, **adhoc_filter} for adhoc_filter in append_adhoc_filters ) if append_filters: for key, value in form_data.items(): if re.match("adhoc_filter.*", key): value.extend( - simple_filter_to_adhoc({"isExtra": True, **fltr}) # type: ignore + simple_filter_to_adhoc({"isExtra": True, **fltr}) for fltr in append_filters if fltr ) diff --git a/superset/viz.py b/superset/viz.py index 43b85a29f..f36a17a34 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -2458,7 +2458,7 @@ class RoseViz(NVD3TimeSeriesViz): result[timestamp].append( { "key": key, - "value": value, + "value": value, # type: ignore "name": ", ".join(key) if isinstance(key, list) else key, "time": val["x"], } diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py index 4aa570c5e..c0d960f49 100644 --- a/tests/integration_tests/conftest.py +++ b/tests/integration_tests/conftest.py @@ -69,7 +69,7 @@ def login_as(test_client: FlaskClient[Any]): @pytest.fixture def login_as_admin(login_as: Callable[..., None]): - yield login_as("admin") + yield login_as("admin") # type: ignore @pytest.fixture