chore: enforce more ruff rules (#31447)

Co-authored-by: Elizabeth Thompson <eschutho@gmail.com>

tests/unit_tests/commands/databases/columnar_reader_test.py

@@ -153,7 +153,7 @@ def test_excel_reader_wrong_columns_to_read():
             "__filename: string"
         )
         != (
-            "Parsing error: Usecols do not match columns, columns expected but not found: "
+            "Parsing error: Usecols do not match columns, columns expected but not found: "  # noqa: E501
             "['xpto'] (sheet: 0)"
         )
     )

tests/unit_tests/commands/databases/create_test.py

@@ -25,7 +25,7 @@ from superset.exceptions import OAuth2RedirectError
 from superset.extensions import security_manager
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_with_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database with catalogs and schemas.
@@ -42,13 +42,13 @@ def database_with_catalog(mocker: MockerFixture) -> MagicMock:
         {"schema3", "schema4"},
     ]
 
-    DatabaseDAO = mocker.patch("superset.commands.database.create.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.create.DatabaseDAO")  # noqa: N806
     DatabaseDAO.create.return_value = database
 
     return database
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_without_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database without catalogs.
@@ -61,7 +61,7 @@ def database_without_catalog(mocker: MockerFixture) -> MagicMock:
     database.db_engine_spec.supports_catalog = False
     database.get_all_schema_names.return_value = ["schema1", "schema2"]
 
-    DatabaseDAO = mocker.patch("superset.commands.database.create.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.create.DatabaseDAO")  # noqa: N806
     DatabaseDAO.create.return_value = database
 
     return database
@@ -134,7 +134,7 @@ def test_create_with_oauth2(
     """
     Test that the database can be created even if OAuth2 is needed to connect.
     """
-    TestConnectionDatabaseCommand = mocker.patch(
+    TestConnectionDatabaseCommand = mocker.patch(  # noqa: N806
         "superset.commands.database.create.TestConnectionDatabaseCommand"
     )
     TestConnectionDatabaseCommand().run.side_effect = OAuth2RedirectError(

tests/unit_tests/commands/databases/excel_reader_test.py

@@ -237,7 +237,7 @@ def test_excel_reader_invalid_file():
     with pytest.raises(DatabaseUploadFailed) as ex:
         excel_reader.file_to_dataframe(FileStorage(io.BytesIO(b"c1")))
     assert str(ex.value) == (
-        "Parsing error: Excel file format cannot be determined, you must specify an engine manually."
+        "Parsing error: Excel file format cannot be determined, you must specify an engine manually."  # noqa: E501
     )
 
 

tests/unit_tests/commands/databases/tables_test.py

@@ -25,7 +25,7 @@ from superset.extensions import security_manager
 from superset.utils.core import DatasourceName
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_with_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database with catalogs and schemas.
@@ -42,13 +42,13 @@ def database_with_catalog(mocker: MockerFixture) -> MagicMock:
         DatasourceName("view1", "schema1", "catalog1"),
     ]
 
-    DatabaseDAO = mocker.patch("superset.commands.database.tables.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.tables.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database
 
     return database
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_without_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database without catalogs but with schemas.
@@ -65,7 +65,7 @@ def database_without_catalog(mocker: MockerFixture) -> MagicMock:
         DatasourceName("view1", "schema1"),
     ]
 
-    DatabaseDAO = mocker.patch("superset.commands.database.tables.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.tables.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database
 
     return database

tests/unit_tests/commands/databases/test_connection_test.py

@@ -37,7 +37,7 @@ def test_command(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.return_value = True
 
-    DatabaseDAO = mocker.patch("superset.commands.database.test_connection.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.test_connection.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {
@@ -71,7 +71,7 @@ def test_command_with_oauth2(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.side_effect = Exception("OAuth2 needed")
 
-    DatabaseDAO = mocker.patch("superset.commands.database.test_connection.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.test_connection.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {

tests/unit_tests/commands/databases/update_test.py

@@ -35,7 +35,7 @@ oauth2_client_info = {
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_with_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database with catalogs and schemas.
@@ -54,7 +54,7 @@ def database_with_catalog(mocker: MockerFixture) -> MagicMock:
     return database
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_without_catalog(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database without catalogs.
@@ -68,7 +68,7 @@ def database_without_catalog(mocker: MockerFixture) -> MagicMock:
     return database
 
 
-@pytest.fixture()
+@pytest.fixture
 def database_needs_oauth2(mocker: MockerFixture) -> MagicMock:
     """
     Mock a database without catalogs that needs OAuth2.
@@ -106,7 +106,7 @@ def test_update_with_catalog(
     When update is called, only `catalog2.schema3` has permissions associated with it,
     so `catalog1.*` and `catalog2.schema4` are added.
     """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database_with_catalog
     DatabaseDAO.update.return_value = database_with_catalog
 
@@ -156,8 +156,8 @@ def test_update_without_catalog(
 
     When update is called, only `schema2` has permissions associated with it, so `schema1`
     is added.
-    """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    """  # noqa: E501
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database_without_catalog
     DatabaseDAO.update.return_value = database_without_catalog
 
@@ -202,7 +202,7 @@ def test_rename_with_catalog(
     so `catalog1.*` and `catalog2.schema4` are added. Additionally, the database has
     been renamed from `my_db` to `my_other_db`.
     """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     original_database = mocker.MagicMock()
     original_database.database_name = "my_db"
     DatabaseDAO.find_by_id.return_value = original_database
@@ -212,7 +212,7 @@ def test_rename_with_catalog(
     dataset = mocker.MagicMock()
     chart = mocker.MagicMock()
     DatabaseDAO.get_datasets.return_value = [dataset]
-    DatasetDAO = mocker.patch("superset.commands.database.update.DatasetDAO")
+    DatasetDAO = mocker.patch("superset.commands.database.update.DatasetDAO")  # noqa: N806
     DatasetDAO.get_related_objects.return_value = {"charts": [chart]}
 
     find_permission_view_menu = mocker.patch.object(
@@ -273,8 +273,8 @@ def test_rename_without_catalog(
 
     When update is called, only `schema2` has permissions associated with it, so `schema1`
     is added. Additionally, the database has been renamed from `my_db` to `my_other_db`.
-    """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    """  # noqa: E501
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     original_database = mocker.MagicMock()
     original_database.database_name = "my_db"
     DatabaseDAO.find_by_id.return_value = original_database
@@ -315,7 +315,7 @@ def test_update_with_oauth2(
     """
     Test that the database can be updated even if OAuth2 is needed to connect.
     """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database_needs_oauth2
     DatabaseDAO.update.return_value = database_needs_oauth2
 
@@ -349,7 +349,7 @@ def test_update_with_oauth2_changed(
     """
     Test that the database can be updated even if OAuth2 is needed to connect.
     """
-    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")  # noqa: N806
     DatabaseDAO.find_by_id.return_value = database_needs_oauth2
     DatabaseDAO.update.return_value = database_needs_oauth2
 

tests/unit_tests/commands/databases/validate_test.py

@@ -40,7 +40,7 @@ def test_command(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.return_value = True
 
-    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {
@@ -65,7 +65,7 @@ def test_command_invalid(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.return_value = True
 
-    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {
@@ -109,7 +109,7 @@ def test_command_no_ping(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.return_value = False
 
-    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {
@@ -128,7 +128,7 @@ def test_command_no_ping(mocker: MockerFixture) -> None:
             "issue_codes": [
                 {
                     "code": 1002,
-                    "message": "Issue 1002 - The database returned an unexpected error.",
+                    "message": "Issue 1002 - The database returned an unexpected error.",  # noqa: E501
                 }
             ]
         },
@@ -150,7 +150,7 @@ def test_command_with_oauth2(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.side_effect = Exception("OAuth2 needed")
 
-    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {
@@ -185,7 +185,7 @@ def test_command_with_oauth2_not_configured(mocker: MockerFixture) -> None:
     with database.get_sqla_engine() as engine:
         engine.dialect.do_ping.side_effect = Exception("OAuth2 needed")
 
-    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")
+    DatabaseDAO = mocker.patch("superset.commands.database.validate.DatabaseDAO")  # noqa: N806
     DatabaseDAO.build_db_for_connection_test.return_value = database
 
     properties = {