[MAINTENANCE] ruff 0.2.2

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     hooks:
       - id: black-jupyter
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.1.14"
+    rev: "v0.2.2"
     hooks:
       - id: ruff
         files: ^(great_expectations|assets|contrib|scripts|tasks\.py|tests) # TODO: add docs/ etc.

contrib/cli/requirements.txt

@@ -4,6 +4,6 @@ cookiecutter==2.1.1  # Project templating
 mypy==1.7.1            # Type checker
 pydantic>=1.0        # Needed for mypy plugin
 pytest>=5.3.5        # Test framework
-ruff==0.1.14        # Linting / code style
+ruff==0.2.2        # Linting / code style
 twine==3.7.1         # Packaging
 wheel==0.38.1        # Packaging

contrib/ruff.toml

@@ -3,7 +3,7 @@
 # root linter settings are defined in the file below
 extend = "../pyproject.toml"
 
-extend-ignore = [
+lint.extend-ignore = [
     # https://github.com/charliermarsh/ruff#flake8-type-checking-tch
     # This is likely to be a high-touch rule that most contribs don't need to care about.
     "TCH001",
@@ -19,6 +19,6 @@ extend-ignore = [
     "NPY002", # these methods are deprecated in numpy 2 but will not be removed
 ]
 
-[isort]
+[lint.isort]
 known-first-party = ["great_expectations", "tests"]
 known-third-party = ["dataprofiler", "capitalone_dataprofiler_expectations"]

great_expectations/dataset/pandas_dataset.py

@@ -494,7 +494,7 @@ def get_column_value_counts(self, column, sort="value", collate=None):
                 # Having values of multiple types in a object dtype column (e.g., strings and floats)
                 # raises a TypeError when the sorting method performs comparisons.
                 # Related to the noqa E721 below: numpy / pandas implements equality, see https://github.com/astral-sh/ruff/issues/9570
-                if self[column].dtype == object:  # noqa: E721
+                if self[column].dtype == object:
                     counts.index = counts.index.astype(str)
                     counts.sort_index(inplace=True)
         elif sort == "counts":

great_expectations/dataset/ruff.toml

@@ -4,7 +4,7 @@
 extend = "../../pyproject.toml"
 
 # relaxing linting rules for legacy dataset module
-extend-ignore = [
+lint.extend-ignore = [
     # https://github.com/charliermarsh/ruff#pyflakes-f
     "F841", # unused-variable
     # https://github.com/charliermarsh/ruff#error-e

great_expectations/expectations/core/expect_column_pair_values_a_to_be_greater_than_b.py

@@ -112,7 +112,7 @@ def _prescriptive_template(
         if not params.column_A or not params.column_B:
             template_str += "$column has a bogus `expect_column_pair_values_A_to_be_greater_than_B` expectation. "
 
-        if not params.mostly or params.mostly.value == 1.0:  # noqa: PLR2004
+        if not params.mostly or params.mostly.value == 1.0:
             if not params.or_equal:
                 template_str += "Values in $column_A must always be greater than those in $column_B."
             else:
@@ -160,7 +160,7 @@ def _prescriptive_renderer(
             template_str = "$column has a bogus `expect_column_pair_values_A_to_be_greater_than_B` expectation."
             params["row_condition"] = None
 
-        if params["mostly"] is None or params["mostly"] == 1.0:  # noqa: PLR2004
+        if params["mostly"] is None or params["mostly"] == 1.0:
             if params["or_equal"] in [None, False]:
                 template_str = "Values in $column_A must always be greater than those in $column_B."
             else:

great_expectations/expectations/core/expect_column_pair_values_to_be_equal.py

@@ -106,7 +106,7 @@ def _prescriptive_template(
         if not params.column_A or not params.column_B:
             template_str += "Unrecognized kwargs for expect_column_pair_values_to_be_equal: missing column. "
 
-        if not params.mostly or params.mostly.value == 1.0:  # noqa: PLR2004
+        if not params.mostly or params.mostly.value == 1.0:
             template_str += "Values in $column_A and $column_B must always be equal."
         else:
             renderer_configuration = cls._add_mostly_pct_param(
@@ -149,7 +149,7 @@ def _prescriptive_renderer(
             template_str = " unrecognized kwargs for expect_column_pair_values_to_be_equal: missing column."
             params["row_condition"] = None
 
-        if params["mostly"] is None or params["mostly"] == 1.0:  # noqa: PLR2004
+        if params["mostly"] is None or params["mostly"] == 1.0:
             template_str = "Values in $column_A and $column_B must always be equal."
         else:
             params["mostly_pct"] = num_to_str(

great_expectations/expectations/core/expect_column_unique_value_count_to_be_between.py

@@ -141,7 +141,7 @@ def _prescriptive_template(  # noqa: PLR0912
                     renderer_configuration=renderer_configuration
                 )
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -200,7 +200,7 @@ def _prescriptive_renderer(
         if (params["min_value"] is None) and (params["max_value"] is None):
             template_str = "may have any number of unique values."
         else:  # noqa: PLR5501
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_value_lengths_to_be_between.py

@@ -208,7 +208,7 @@ def _prescriptive_template(  # noqa: PLR0912
                     renderer_configuration=renderer_configuration
                 )
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -277,7 +277,7 @@ def _prescriptive_renderer(
         else:
             at_least_str, at_most_str = handle_strict_min_max(params)
 
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_value_lengths_to_equal.py

@@ -109,7 +109,7 @@ def _prescriptive_template(
             template_str = "values may have any length."
         else:
             template_str = "values must be $value characters long"
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -148,7 +148,7 @@ def _prescriptive_renderer(
             template_str = "values may have any length."
         else:
             template_str = "values must be $value characters long"
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_values_to_be_between.py

@@ -167,7 +167,7 @@ def _prescriptive_template(
             else:
                 template_str += f"values must be {at_least_str} $min_value"
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -220,7 +220,7 @@ def _prescriptive_renderer(
             at_least_str, at_most_str = handle_strict_min_max(params)
 
             mostly_str = ""
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_values_to_be_dateutil_parseable.py

@@ -90,7 +90,7 @@ def _prescriptive_template(
 
         template_str = "values must be parseable by dateutil"
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -127,7 +127,7 @@ def _prescriptive_renderer(
 
         template_str = "values must be parseable by dateutil"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_decreasing.py

@@ -109,7 +109,7 @@ def _prescriptive_template(
         else:
             template_str = "values must be less than or equal to previous values"
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -155,7 +155,7 @@ def _prescriptive_renderer(
         else:
             template_str = "values must be less than or equal to previous values"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_in_set.py

@@ -162,7 +162,7 @@ def _prescriptive_template(
             )
             template_str += f"values must belong to this set: {value_set_str}"
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -214,7 +214,7 @@ def _prescriptive_renderer(
 
         template_str = f"values must belong to this set: {values_string}"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_in_type_list.py

@@ -162,7 +162,7 @@ def _prescriptive_template(
                 renderer_configuration=renderer_configuration,
             )
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -213,7 +213,7 @@ def _prescriptive_renderer(
                 [f"$v__{i!s}" for i, v in enumerate(params["type_list"])]
             )
 
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_values_to_be_increasing.py

@@ -109,7 +109,7 @@ def _prescriptive_template(
         else:
             template_str = "values must be greater than or equal to previous values"
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -155,7 +155,7 @@ def _prescriptive_renderer(
         else:
             template_str = "values must be greater than or equal to previous values"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_json_parseable.py

@@ -98,7 +98,7 @@ def _prescriptive_template(
 
         template_str = "values must be parseable as JSON"
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -135,7 +135,7 @@ def _prescriptive_renderer(
 
         template_str = "values must be parseable as JSON"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_null.py

@@ -110,7 +110,7 @@ def _prescriptive_template(
 
         params = renderer_configuration.params
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -144,7 +144,7 @@ def _prescriptive_renderer(
             ["column", "mostly", "row_condition", "condition_parser"],
         )
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_of_type.py

@@ -168,7 +168,7 @@ def _prescriptive_template(
 
         params = renderer_configuration.params
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -209,7 +209,7 @@ def _prescriptive_renderer(
             ["column", "type_", "mostly", "row_condition", "condition_parser"],
         )
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_be_unique.py

@@ -105,7 +105,7 @@ def _prescriptive_template(
         else:
             template_str = "values must be unique"
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -143,7 +143,7 @@ def _prescriptive_renderer(  # type: ignore[override] # TODO: Fix this type igno
         else:
             template_str = "values must be unique"
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_match_json_schema.py

@@ -121,7 +121,7 @@ def _prescriptive_template(
                 value=formatted_json,
             )
 
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -164,7 +164,7 @@ def _prescriptive_renderer(
             params[
                 "formatted_json"
             ] = f"<pre>{json.dumps(params.get('json_schema'), indent=4)}</pre>"
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_values_to_match_like_pattern_list.py

@@ -175,7 +175,7 @@ def _prescriptive_renderer(
 
         template_str = "Values must match the following like patterns: " + values_string
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )

great_expectations/expectations/core/expect_column_values_to_match_regex.py

@@ -144,7 +144,7 @@ def _prescriptive_template(
             )
         else:
             template_str = "values must match this regular expression: $regex"
-            if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+            if params.mostly and params.mostly.value < 1.0:
                 renderer_configuration = cls._add_mostly_pct_param(
                     renderer_configuration=renderer_configuration
                 )
@@ -185,7 +185,7 @@ def _prescriptive_renderer(
             )
         else:
             template_str = "values must match this regular expression: $regex"
-            if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+            if params["mostly"] is not None and params["mostly"] < 1.0:
                 params["mostly_pct"] = num_to_str(
                     params["mostly"] * 100, no_scientific=True
                 )

great_expectations/expectations/core/expect_column_values_to_match_regex_list.py

@@ -149,7 +149,7 @@ def _prescriptive_template(
                 + values_string
             )
 
-        if params.mostly and params.mostly.value < 1.0:  # noqa: PLR2004
+        if params.mostly and params.mostly.value < 1.0:
             renderer_configuration = cls._add_mostly_pct_param(
                 renderer_configuration=renderer_configuration
             )
@@ -211,7 +211,7 @@ def _prescriptive_renderer(
                 + values_string
             )
 
-        if params["mostly"] is not None and params["mostly"] < 1.0:  # noqa: PLR2004
+        if params["mostly"] is not None and params["mostly"] < 1.0:
             params["mostly_pct"] = num_to_str(
                 params["mostly"] * 100, no_scientific=True
             )