From 0bb321d97c0702a28f11b14b2805ce19d590ceff Mon Sep 17 00:00:00 2001 From: Robin Linacre Date: Fri, 5 Apr 2024 11:39:22 +0100 Subject: [PATCH] fix_linting_errors --- .github/workflows/autoruff.yml | 2 +- splink/linker.py | 2 +- splink/postgres/dataframe.py | 2 +- splink/settings_validation/settings_column_cleaner.py | 2 +- splink/sqlite/dataframe.py | 2 +- tests/test_comparison_level.py | 2 +- tests/test_input_column.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/autoruff.yml b/.github/workflows/autoruff.yml index 5b5969e0b7..7cfbff1149 100644 --- a/.github/workflows/autoruff.yml +++ b/.github/workflows/autoruff.yml @@ -1,4 +1,4 @@ -name: autoruff +name: Lint with ruff on: pull_request: branches: diff --git a/splink/linker.py b/splink/linker.py index 804f714ccc..b50d949311 100644 --- a/splink/linker.py +++ b/splink/linker.py @@ -603,7 +603,7 @@ def _populate_probability_two_random_records_match_from_trained_values(self): ), ) for em_training_session in self._em_training_sessions: - training_lambda = em_training_session.core_model_settings.probability_two_random_records_match + training_lambda = em_training_session.core_model_settings.probability_two_random_records_match # noqa: E501 training_lambda_bf = prob_to_bayes_factor(training_lambda) reverse_level_infos = ( em_training_session._comparison_levels_to_reverse_blocking_rule diff --git a/splink/postgres/dataframe.py b/splink/postgres/dataframe.py index 86d858cb3d..488007a01f 100644 --- a/splink/postgres/dataframe.py +++ b/splink/postgres/dataframe.py @@ -32,7 +32,7 @@ def columns(self) -> list[InputColumn]: return [InputColumn(c, sql_dialect="postgres") for c in cols] def validate(self): - if type(self.physical_name) is not str: + if not isinstance(self.physical_name, str): raise ValueError( f"{self.templated_name} is not a string dataframe.\n" "Postgres Linker requires input data" diff --git a/splink/settings_validation/settings_column_cleaner.py b/splink/settings_validation/settings_column_cleaner.py index 6241180262..728c2fe888 100644 --- a/splink/settings_validation/settings_column_cleaner.py +++ b/splink/settings_validation/settings_column_cleaner.py @@ -28,7 +28,7 @@ def find_columns_not_in_input_dfs( does not apply any cleaning to the input column(s). """ # the key to use when producing our warning logs - if type(columns_to_check) == str: + if isinstance(columns_to_check, str): columns_to_check = {columns_to_check} return {col for col in columns_to_check if col not in valid_input_dataframe_columns} diff --git a/splink/sqlite/dataframe.py b/splink/sqlite/dataframe.py index 956576d895..892d86371c 100644 --- a/splink/sqlite/dataframe.py +++ b/splink/sqlite/dataframe.py @@ -32,7 +32,7 @@ def columns(self) -> list[InputColumn]: return [InputColumn(c, sql_dialect="sqlite") for c in cols] def validate(self): - if type(self.physical_name) is not str: + if not isinstance(self.physical_name, str): raise ValueError( f"{self.templated_name} is not a string dataframe.\n" "SQLite Linker requires input data" diff --git a/tests/test_comparison_level.py b/tests/test_comparison_level.py index 42fa9d7d75..968f13d982 100644 --- a/tests/test_comparison_level.py +++ b/tests/test_comparison_level.py @@ -80,4 +80,4 @@ def test_exact_match_colnames_for_non_exact_matchy_levels(sql_condition, dialect # _exact_match_colnames should have an error if it is # not actually an exact match level with raises(ValueError): - lev._exact_match_colnames + lev._exact_match_colnames # noqa: B018 diff --git a/tests/test_input_column.py b/tests/test_input_column.py index 149d1496b5..a9b554925a 100644 --- a/tests/test_input_column.py +++ b/tests/test_input_column.py @@ -183,7 +183,7 @@ def test_illegal_names_error(): "my test column", ) for name in odd_but_legal_names: - InputColumn(name).name_l + InputColumn(name).name_l # noqa: B018 # Check some illegal names we want to raise ParserErrors illegal_names = ('sur "name"', '"sur" name', '"sur" name[0]', "sur \"name\"['lat']")