chore: Update pylint to 2.17.4

.pylintrc

@@ -86,6 +86,7 @@ disable=
     missing-docstring,
     duplicate-code,
     unspecified-encoding,
+    cyclic-import,
     # re-enable once this no longer raises false positives
     too-many-instance-attributes
 

requirements/base.txt

@@ -305,7 +305,7 @@ werkzeug==2.3.3
     #   flask
     #   flask-jwt-extended
     #   flask-login
-wrapt==1.12.1
+wrapt==1.15.0
     # via deprecated
 wtforms==2.3.3
     # via

requirements/development.in

@@ -21,7 +21,7 @@
 ipython
 progress>=1.5,<2
 pyinstrument>=4.0.2,<5
-pylint==2.9.6
+pylint==2.14.5
 python-ldap>=3.4.3
 setuptools>=65.5.1
 sqloxide

requirements/development.txt

@@ -1,4 +1,4 @@
-# SHA1:4c0ce3a84b01a5a3fe6c72cbf2fc96e5eada2dbe
+# SHA1:ddea3c4f001a81288c61a968a9ff3788e3cb9dd4
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -12,7 +12,7 @@
     #   -r requirements/development.in
 appnope==0.1.3
     # via ipython
-astroid==2.6.6
+astroid==2.11.7
     # via pylint
 asttokens==2.2.1
     # via stack-data
@@ -34,6 +34,8 @@ charset-normalizer==3.1.0
     # via requests
 decorator==5.1.1
     # via ipython
+dill==0.3.6
+    # via pylint
 et-xmlfile==1.1.0
     # via openpyxl
 executing==1.2.0
@@ -62,7 +64,7 @@ linear-tsv==1.1.0
     # via tabulator
 matplotlib-inline==0.1.6
     # via ipython
-mccabe==0.6.1
+mccabe==0.7.0
     # via pylint
 mysqlclient==2.1.0
     # via apache-superset
@@ -76,6 +78,8 @@ pickleshare==0.7.5
     # via ipython
 pillow==9.5.0
     # via apache-superset
+platformdirs==3.8.1
+    # via pylint
 progress==1.6
     # via -r requirements/development.in
 psycopg2-binary==2.9.6
@@ -98,7 +102,7 @@ pyhive[hive]==0.6.5
     # via apache-superset
 pyinstrument==4.4.0
     # via -r requirements/development.in
-pylint==2.9.6
+pylint==2.14.5
     # via -r requirements/development.in
 python-ldap==3.4.3
     # via -r requirements/development.in
@@ -128,7 +132,9 @@ thrift==0.16.0
     #   thrift-sasl
 thrift-sasl==0.4.3
     # via pyhive
-toml==0.10.2
+tomli==2.0.1
+    # via pylint
+tomlkit==0.11.8
     # via pylint
 traitlets==5.9.0
     # via

superset/charts/commands/delete.py

@@ -64,7 +64,7 @@ def validate(self) -> None:
         if reports := ReportScheduleDAO.find_by_chart_ids(self._model_ids):
             report_names = [report.name for report in reports]
             raise ChartDeleteFailedReportsExistError(
-                _("There are associated alerts or reports: %s" % ",".join(report_names))
+                _(f"There are associated alerts or reports: {','.join(report_names)}")
             )
         # Check ownership
         for model in self._models:

superset/charts/commands/warm_up_cache.py

@@ -62,7 +62,6 @@ def run(self) -> dict[str, Any]:
                 force=True,
             )
 
-            # pylint: disable=assigning-non-slot
             g.form_data = form_data
             payload = obj.get_payload()
             delattr(g, "form_data")

superset/charts/data/api.py

@@ -143,7 +143,7 @@ def get_data(self, pk: int) -> Response:
             query_context = self._create_query_context_from_form(json_body)
             command = ChartDataCommand(query_context)
             command.validate()
-        except DatasourceNotFound as error:
+        except DatasourceNotFound:
             return self.response_404()
         except QueryObjectValidationError as error:
             return self.response_400(message=error.message)
@@ -233,7 +233,7 @@ def data(self) -> Response:
             query_context = self._create_query_context_from_form(json_body)
             command = ChartDataCommand(query_context)
             command.validate()
-        except DatasourceNotFound as error:
+        except DatasourceNotFound:
             return self.response_404()
         except QueryObjectValidationError as error:
             return self.response_400(message=error.message)
@@ -420,11 +420,10 @@ def _get_data_response(
 
         return self._send_chart_response(result, form_data, datasource)
 
-    # pylint: disable=invalid-name, no-self-use
+    # pylint: disable=invalid-name
     def _load_query_context_form_from_cache(self, cache_key: str) -> dict[str, Any]:
         return QueryContextCacheLoader.load(cache_key)
 
-    # pylint: disable=no-self-use
     def _create_query_context_from_form(
         self, form_data: dict[str, Any]
     ) -> QueryContext:

superset/charts/filters.py

@@ -160,7 +160,8 @@ def apply(self, query: Query, value: Any) -> Query:
                 Slice.id == FavStar.obj_id,
             ),
             isouter=True,
-        ).filter(  # pylint: disable=comparison-with-callable
+        ).filter(
+            # pylint: disable=comparison-with-callable
             or_(
                 Slice.id.in_(owner_ids_query),
                 Slice.created_by_fk == get_user_id(),

superset/cli/importexport.py

@@ -74,7 +74,6 @@ def export_dashboards(dashboard_file: Optional[str] = None) -> None:
         from superset.dashboards.commands.export import ExportDashboardsCommand
         from superset.models.dashboard import Dashboard
 
-        # pylint: disable=assigning-non-slot
         g.user = security_manager.find_user(username="admin")
 
         dashboard_ids = [id_ for (id_,) in db.session.query(Dashboard.id).all()]
@@ -109,7 +108,6 @@ def export_datasources(datasource_file: Optional[str] = None) -> None:
         from superset.connectors.sqla.models import SqlaTable
         from superset.datasets.commands.export import ExportDatasetsCommand
 
-        # pylint: disable=assigning-non-slot
         g.user = security_manager.find_user(username="admin")
 
         dataset_ids = [id_ for (id_,) in db.session.query(SqlaTable.id).all()]
@@ -151,7 +149,6 @@ def import_dashboards(path: str, username: Optional[str]) -> None:
         )
 
         if username is not None:
-            # pylint: disable=assigning-non-slot
             g.user = security_manager.find_user(username=username)
         if is_zipfile(path):
             with ZipFile(path) as bundle:
@@ -317,7 +314,6 @@ def import_dashboards(path: str, recursive: bool, username: str) -> None:
         elif path_object.exists() and recursive:
             files.extend(path_object.rglob("*.json"))
         if username is not None:
-            # pylint: disable=assigning-non-slot
             g.user = security_manager.find_user(username=username)
         contents = {}
         for path_ in files:

superset/cli/main.py

@@ -71,12 +71,7 @@ def init() -> None:
 def version(verbose: bool) -> None:
     """Prints the current version number"""
     print(Fore.BLUE + "-=" * 15)
-    print(
-        Fore.YELLOW
-        + "Superset "
-        + Fore.CYAN
-        + "{version}".format(version=app.config["VERSION_STRING"])
-    )
+    print(Fore.YELLOW + "Superset " + Fore.CYAN + f"{app.config['VERSION_STRING']}")
     print(Fore.BLUE + "-=" * 15)
     if verbose:
         print("[DB] : " + f"{db.engine}")

superset/commands/exceptions.py

@@ -44,7 +44,7 @@ def __init__(
         super().__init__(
             _(
                 self.message_format.format(
-                    object_type, '"%s" ' % object_id if object_id else ""
+                    object_type, f'"{object_id}" ' if object_id else ""
                 )
             ),
             exception,

superset/commands/importers/v1/examples.py

@@ -91,7 +91,7 @@ def _get_uuids(cls) -> set[str]:
         )
 
     @staticmethod
-    def _import(  # pylint: disable=arguments-differ, too-many-locals, too-many-branches
+    def _import(  # pylint: disable=too-many-locals, too-many-branches
         session: Session,
         configs: dict[str, Any],
         overwrite: bool = False,

superset/common/query_context_factory.py

@@ -93,7 +93,6 @@ def create(
             cache_values=cache_values,
         )
 
-    # pylint: disable=no-self-use
     def _convert_to_model(self, datasource: DatasourceDict) -> BaseDatasource:
         return DatasourceDAO.get_datasource(
             session=db.session,

superset/common/query_object_factory.py

@@ -82,7 +82,7 @@ def _convert_to_model(self, datasource: DatasourceDict) -> BaseDatasource:
             session=self._session_maker(),
         )
 
-    def _process_extras(  # pylint: disable=no-self-use
+    def _process_extras(
         self,
         extras: dict[str, Any] | None,
     ) -> dict[str, Any]:

superset/config.py

@@ -1147,6 +1147,7 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(  # pylint: disable=invalid-name
 #   TRACKING_URL_TRANSFORMER = (
 #       lambda url, query: url if is_fresh(query) else None
 #   )
+# pylint: disable=unnecessary-lambda-assignment
 TRACKING_URL_TRANSFORMER = lambda url: url
 
 
@@ -1466,6 +1467,7 @@ def EMAIL_HEADER_MUTATOR(  # pylint: disable=invalid-name,unused-argument
 # This can be used to set any properties of the object based on naming
 # conventions and such. You can find examples in the tests.
 
+# pylint: disable=unnecessary-lambda-assignment
 SQLA_TABLE_MUTATOR = lambda table: table
 
 

superset/connectors/base/models.py

@@ -589,7 +589,7 @@ def update_from_object(self, obj: dict[str, Any]) -> None:
             else []
         )
 
-    def get_extra_cache_keys(  # pylint: disable=no-self-use
+    def get_extra_cache_keys(
         self, query_obj: QueryObjectDict  # pylint: disable=unused-argument
     ) -> list[Hashable]:
         """If a datasource needs to provide additional keys for calculation of

superset/connectors/sqla/models.py

@@ -300,7 +300,7 @@ def type_generic(self) -> utils.GenericDataType | None:
             return GenericDataType.TEMPORAL
 
         return (
-            column_spec.generic_type  # pylint: disable=used-before-assignment
+            column_spec.generic_type
             if (
                 column_spec := self.db_engine_spec.get_column_spec(
                     self.type,

superset/connectors/sqla/views.py

@@ -335,7 +335,7 @@ class TableModelView(  # pylint: disable=too-many-ancestors
         "offset": _("Timezone offset (in hours) for this datasource"),
         "table_name": _("Name of the table that exists in the source database"),
         "schema": _(
-            "Schema, as used only in some databases like Postgres, Redshift " "and DB2"
+            "Schema, as used only in some databases like Postgres, Redshift and DB2"
         ),
         "description": Markup(
             'Supports <a href="https://daringfireball.net/projects/markdown/">'
@@ -361,7 +361,7 @@ class TableModelView(  # pylint: disable=too-many-ancestors
             "from the backend on the fly"
         ),
         "is_sqllab_view": _(
-            "Whether the table was generated by the 'Visualize' flow " "in SQL Lab"
+            "Whether the table was generated by the 'Visualize' flow in SQL Lab"
         ),
         "template_params": _(
             "A set of parameters that become available in the query using "
@@ -410,7 +410,7 @@ class TableModelView(  # pylint: disable=too-many-ancestors
         )
     }
 
-    def post_add(  # pylint: disable=arguments-differ
+    def post_add(
         self,
         item: "TableModelView",
         flash_message: bool = True,

superset/daos/base.py

@@ -33,7 +33,7 @@
 from superset.extensions import db
 from superset.utils.core import get_iterable
 
-T = TypeVar("T", bound=Model)  # pylint: disable=invalid-name
+T = TypeVar("T", bound=Model)
 
 
 class BaseDAO(Generic[T]):

superset/dashboards/api.py

@@ -284,10 +284,9 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
 
     def __repr__(self) -> str:
         """Deterministic string representation of the API instance for etag_cache."""
-        return "Superset.dashboards.api.DashboardRestApi@v{}{}".format(
-            self.appbuilder.app.config["VERSION_STRING"],
-            self.appbuilder.app.config["VERSION_SHA"],
-        )
+        version_str = self.appbuilder.app.config["VERSION_STRING"]
+        version_sha = self.appbuilder.app.config["VERSION_SHA"]
+        return f"Superset.dashboards.api.DashboardRestApi@v{version_str}{version_sha}"
 
     @expose("/<id_or_slug>", methods=("GET",))
     @protect()
@@ -305,7 +304,7 @@ def __repr__(self) -> str:
     @statsd_metrics
     @with_dashboard
     @event_logger.log_this_with_extra_payload
-    # pylint: disable=arguments-differ
+    # pylint: disable=arguments-differ,arguments-renamed
     def get(
         self,
         dash: Dashboard,
@@ -756,8 +755,8 @@ def bulk_delete(self, **kwargs: Any) -> Response:
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
-    )  # pylint: disable=too-many-locals
-    def export(self, **kwargs: Any) -> Response:
+    )
+    def export(self, **kwargs: Any) -> Response:  # pylint: disable=too-many-locals
         """Export dashboards
         ---
         get:

superset/dashboards/commands/delete.py

@@ -60,7 +60,7 @@ def validate(self) -> None:
         if reports := ReportScheduleDAO.find_by_dashboard_ids(self._model_ids):
             report_names = [report.name for report in reports]
             raise DashboardDeleteFailedReportsExistError(
-                _("There are associated alerts or reports: %s" % ",".join(report_names))
+                _(f"There are associated alerts or reports: {','.join(report_names)}")
             )
         # Check ownership
         for model in self._models:

superset/dashboards/filter_sets/api.py

@@ -123,7 +123,6 @@ def __init__(self) -> None:
         super().__init__()
 
     def _init_properties(self) -> None:
-        # pylint: disable=bad-super-call
         super(BaseSupersetModelRestApi, self)._init_properties()
 
     @expose("/<int:dashboard_id>/filtersets", methods=("GET",))
@@ -181,7 +180,7 @@ def get_list(self, dashboard_id: int, **kwargs: Any) -> Response:
               $ref: '#/components/responses/404'
         """
         if not DashboardDAO.find_by_id(cast(int, dashboard_id)):
-            return self.response(404, message="dashboard '%s' not found" % dashboard_id)
+            return self.response(404, message=f"dashboard '{dashboard_id}' not found")
         rison_data = kwargs.setdefault("rison", {})
         rison_data.setdefault("filters", [])
         rison_data["filters"].append(

superset/dashboards/filter_sets/commands/delete.py

@@ -49,7 +49,6 @@ def validate(self) -> None:
         except FilterSetNotFoundError as err:
             if FilterSetDAO.find_by_id(self._filter_set_id):  # type: ignore
                 raise FilterSetForbiddenError(
-                    'the filter-set does not related to dashboard "%s"'
-                    % str(self._dashboard_id)
+                    f"the filter-set does not related to dashboard {self._dashboard_id}"
                 ) from err
             raise err

superset/dashboards/filter_sets/schemas.py

@@ -46,7 +46,6 @@ def _validate_json_meta_data(self, json_meta_data: str) -> None:
 
 class FilterSetPostSchema(FilterSetSchema):
     json_metadata_schema: JsonMetadataSchema = JsonMetadataSchema()
-    # pylint: disable=W0613
     name = fields.String(
         required=True,
         allow_none=False,
@@ -83,7 +82,7 @@ class FilterSetPutSchema(FilterSetSchema):
     )
 
     @post_load
-    def validate(  # pylint: disable=unused-argument
+    def validate(
         self, data: Mapping[Any, Any], *, many: Any, partial: Any
     ) -> dict[str, Any]:
         if JSON_METADATA_FIELD in data: