Merge branch 'develop' into m/ph-692/table-or-multi-column-expectatio…

…n-schemas-3

.github/workflows/ci.yml

@@ -36,13 +36,13 @@ concurrency:
 
 jobs:
   ci-does-not-run-on-draft-pull-requests:
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     if: github.event.pull_request.draft == true
     steps:
       - run: echo "CI jobs won't run because this is a draft pull request."
 
   ci-is-on-main-repo:
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     # job only runs on main repo where we have access to credentials, or as part of the release
     if: |
       github.event.pull_request.head.repo.full_name == github.repository ||
@@ -52,7 +52,7 @@ jobs:
       - run: echo "This CI step only runs on the main repo, where we have access to credentials."
 
   static-analysis:
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
       (github.event.pull_request.draft == false && github.base_ref == 'develop') ||
       (github.event_name == 'push' && contains(github.ref, 'refs/tags/1.')) ||
       github.event_name == 'merge_group'
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         doc-step:
@@ -177,7 +177,7 @@ jobs:
   unit-tests:
     strategy:
       matrix:
-        os: [enterprise-arc]
+        os: [ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     runs-on: ${{ matrix.os }}
@@ -212,7 +212,7 @@ jobs:
   doc-checks:
     needs: [static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -251,7 +251,7 @@ jobs:
       (github.event.pull_request.draft == false && github.base_ref == 'develop') ||
       (github.event_name == 'push' && contains(github.ref, 'refs/tags/1.')) ||
       github.event_name == 'merge_group'
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -275,7 +275,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     env:
       GX_CLOUD_BASE_URL: ${{vars.MERCURY_BASE_URL}}
       PACT_BROKER_READ_WRITE_TOKEN: ${{secrets.PACT_BROKER_READ_WRITE_TOKEN}}
@@ -361,7 +361,7 @@ jobs:
       SNOWFLAKE_SCHEMA: ${{secrets.SNOWFLAKE_SCHEMA}}
       SNOWFLAKE_WAREHOUSE: ${{secrets.SNOWFLAKE_WAREHOUSE}}
       SNOWFLAKE_ROLE: ${{secrets.SNOWFLAKE_ROLE}}
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -419,7 +419,7 @@ jobs:
   py38-min-versions:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -437,7 +437,7 @@ jobs:
   py39-min-versions:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -455,7 +455,7 @@ jobs:
   py310-min-versions:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -473,7 +473,7 @@ jobs:
   py311-min-versions:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -491,7 +491,7 @@ jobs:
   pydantic-v1:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -509,7 +509,7 @@ jobs:
   numpy-2:
     needs: [unit-tests, static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -528,7 +528,7 @@ jobs:
 
   airflow-min-versions:
     needs: [unit-tests, static-analysis]
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -547,7 +547,7 @@ jobs:
   import_gx:
     needs: [static-analysis]
     if: github.event.pull_request.draft == false
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
@@ -588,7 +588,7 @@ jobs:
       ]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     name: Build and publish Python distributions to PyPI
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     environment:
       name: pypi
       url: https://pypi.org/p/great-expectations
@@ -636,7 +636,7 @@ jobs:
         build-n-publish,
       ]
     if: always() && !cancelled() && contains(needs.*.result, 'failure') && github.event_name != 'pull_request' && github.event_name != 'merge_group'
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Scheduled CI job failure
         id: slack
@@ -652,7 +652,7 @@ jobs:
 
   notify_on_release:
     needs: [build-n-publish]
-    runs-on: enterprise-arc
+    runs-on: ubuntu-latest
     steps:
       - name: Announce Release
         id: slack

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: detect-private-key
         exclude: tests/test_fixtures/database_key_test*
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.4.4"
+    rev: "v0.4.8"
     hooks:
       - id: ruff
         args: ["--fix"]

contrib/cli/requirements.txt

@@ -3,6 +3,6 @@ cookiecutter==2.1.1  # Project templating
 mypy==1.10.0            # Type checker
 pydantic>=1.0        # Needed for mypy plugin
 pytest>=5.3.5        # Test framework
-ruff==0.4.4        # Linting / code style / formatting
+ruff==0.4.8        # Linting / code style / formatting
 twine==3.7.1         # Packaging
 wheel==0.38.1        # Packaging

great_expectations/data_context/util.py

@@ -26,7 +26,7 @@
 
 # TODO: Rename config to constructor_kwargs and config_defaults -> constructor_kwarg_default
 # TODO: Improve error messages in this method. Since so much of our workflow is config-driven, this will be a *super* important part of DX.  # noqa: E501
-def instantiate_class_from_config(  # noqa: C901, PLR0912
+def instantiate_class_from_config(  # noqa: C901
     config, runtime_environment, config_defaults=None
 ):
     """Build a GX class from configuration dictionaries."""

great_expectations/expectations/core/expect_column_values_to_be_of_type.py

@@ -605,7 +605,7 @@ def _validate(
             )
 
 
-def _get_dialect_type_module(  # noqa: C901, PLR0911, PLR0912
+def _get_dialect_type_module(  # noqa: C901, PLR0911
     execution_engine,
 ):
     if execution_engine.dialect_module is None:

great_expectations/expectations/row_conditions.py

@@ -125,7 +125,7 @@ def _parse_great_expectations_condition(row_condition: str):
 
 
 # noinspection PyUnresolvedReferences
-def parse_condition_to_spark(  # type: ignore[return] # return or raise exists for all branches  # noqa: C901, PLR0911, PLR0912
+def parse_condition_to_spark(  # type: ignore[return] # return or raise exists for all branches  # noqa: C901, PLR0911
     row_condition: str,
 ) -> pyspark.Column:
     parsed = _parse_great_expectations_condition(row_condition)

great_expectations/render/renderer/content_block/content_block.py

@@ -214,7 +214,7 @@ def _render_list(  # noqa: C901, PLR0912, PLR0913
             return None
 
     @classmethod
-    def _render_other(  # noqa: C901, PLR0912, PLR0913
+    def _render_other(  # noqa: C901, PLR0913
         cls,
         render_object: Any,
         exception_list_content_block: bool,

great_expectations/render/renderer_configuration.py

@@ -206,7 +206,7 @@ class Config:
             allow_mutation = False
 
         @root_validator(pre=True)
-        def _validate_param_type_matches_value(  # noqa: C901, PLR0912
+        def _validate_param_type_matches_value(  # noqa: C901
             cls, values: dict
         ) -> dict:
             """

reqs/requirements-dev-contrib.txt

@@ -2,5 +2,5 @@ adr-tools-python==1.0.3
 invoke>=2.0.0
 mypy==1.10
 pre-commit>=2.21.0
-ruff==0.4.4
+ruff==0.4.8
 tomli>=2.0.1

tasks.py

@@ -494,7 +494,7 @@ def docker(
         " Can be combined with `--sync` to reset the /schemas dir and remove stale schemas",
     },
 )
-def type_schema(  # noqa: C901, PLR0912 - too complex
+def type_schema(  # noqa: C901 - too complex
     ctx: Context,
     sync: bool = False,
     clean: bool = False,

tests/data_context/test_data_context_utils.py

@@ -54,7 +54,7 @@ def test_load_class_raises_error_when_module_name_is_not_string():
 @pytest.mark.filterwarnings(
     "ignore:SQLAlchemy is not installed*:UserWarning:great_expectations.data_context.util"
 )
-def test_password_masker_mask_db_url(  # noqa: PLR0912,PLR0915,C901- 11
+def test_password_masker_mask_db_url(  # noqa: PLR0915, C901- 11
     monkeypatch, tmp_path
 ):
     """

tests/integration/test_script_runner.py

@@ -422,7 +422,7 @@ def test_integration_tests(test_configuration, tmp_path, pytest_parsed_arguments
     _execute_integration_test(test_configuration, tmp_path)
 
 
-def _execute_integration_test(  # noqa: C901, PLR0912, PLR0915
+def _execute_integration_test(  # noqa: C901, PLR0915
     integration_test_fixture: IntegrationTestFixture, tmp_path: pathlib.Path
 ):
     """