Skip to content

Commit

Permalink
Merge branch 'develop' into m/none/deprecation-wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
Kilo59 committed Dec 19, 2022
2 parents b1b5aea + 28b25d0 commit 6fe0755
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 28 deletions.
10 changes: 7 additions & 3 deletions great_expectations/checkpoint/actions.py
Expand Up @@ -3,10 +3,11 @@
The only requirement from an action is for it to have a take_action method.
"""
from __future__ import annotations

import logging
import warnings
from typing import Dict, Optional, Union
from typing import TYPE_CHECKING, Dict, Optional, Union
from urllib.parse import urljoin

from great_expectations.core import ExpectationSuiteValidationResult
Expand Down Expand Up @@ -34,6 +35,9 @@
from great_expectations.data_context.util import instantiate_class_from_config
from great_expectations.exceptions import ClassInstantiationError, DataContextError

if TYPE_CHECKING:
from great_expectations.data_context import DataContext

logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -1118,7 +1122,7 @@ class CloudNotificationAction(ValidationAction):

def __init__(
self,
data_context: "DataContext",
data_context: DataContext,
checkpoint_ge_cloud_id: str,
) -> None:
super().__init__(data_context)
Expand Down Expand Up @@ -1169,7 +1173,7 @@ class SNSNotificationAction(ValidationAction):
"""

def __init__(
self, data_context: "DataContext", sns_topic_arn: str, sns_message_subject
self, data_context: DataContext, sns_topic_arn: str, sns_message_subject
) -> None:
super().__init__(data_context)
self.sns_topic_arn = sns_topic_arn
Expand Down
18 changes: 7 additions & 11 deletions great_expectations/jupyter_ux/expectation_explorer.py
Expand Up @@ -490,7 +490,7 @@ def generate_remove_expectation_button(self, expectation_state):
@expectation_feedback_widget.capture(clear_output=True)
def on_click(button) -> None:
editor_widget = expectation_state.get("editor_widget")
expectation = data_asset.remove_expectation(
_ = data_asset.remove_expectation(
expectation_type=expectation_type, column=column
)
data_asset_state = self.state["data_assets"].get(data_asset_name, {})
Expand Down Expand Up @@ -1178,7 +1178,7 @@ def on_min_max_type_change(change) -> None:

return {"kwarg_widget": min_max_type_widget}

def generate_min_value_widget_dict(
def generate_min_value_widget_dict( # noqa: C901 - 20
self, expectation_state, min_value=None, column=None, **expectation_kwargs
):
data_asset_name = expectation_state["data_asset_name"]
Expand Down Expand Up @@ -1315,9 +1315,7 @@ def on_min_value_change(change) -> None:
)

min_value_widget.observe(on_min_value_change, names="value")
max_dl = widgets.link(
(max_value_widget, "value"), (min_value_widget, "max")
)
_ = widgets.link((max_value_widget, "value"), (min_value_widget, "max"))
expectation_state["kwargs"]["max_value"] = {
"kwarg_widget": max_value_widget
}
Expand All @@ -1335,7 +1333,7 @@ def on_min_value_change(change) -> None:

return min_value_widget_dict

def generate_max_value_widget_dict(
def generate_max_value_widget_dict( # noqa: C901 - 19
self, expectation_state, max_value=None, column=None, **expectation_kwargs
):
data_asset_name = expectation_state["data_asset_name"]
Expand Down Expand Up @@ -1472,9 +1470,7 @@ def on_max_value_change(change) -> None:
)

max_value_widget.observe(on_max_value_change, names="value")
min_dl = widgets.link(
(min_value_widget, "value"), (max_value_widget, "min")
)
_ = widgets.link((min_value_widget, "value"), (max_value_widget, "min"))
expectation_state["kwargs"]["min_value"] = {
"kwarg_widget": min_value_widget
}
Expand Down Expand Up @@ -1962,11 +1958,11 @@ def edit_expectation_suite(self, data_asset):
)
expectations = expectation_suite.get("expectations")

################### editor widgets
# ################## editor widgets
for expectation in expectations:
expectation_type = expectation.get("expectation_type")
expectation_kwargs = expectation.get("kwargs")
editor_widget = getattr(data_asset, expectation_type)(
_ = getattr(data_asset, expectation_type)(
include_config=True, **expectation_kwargs
)

Expand Down
Expand Up @@ -132,7 +132,7 @@ def _add_sample_checkpoint_config(self) -> None:
sample_yaml_str,
lint=True,
)
except:
except Exception:
# For any error
self.add_markdown_cell(
"Sorry, we were unable to create a sample configuration. Perhaps you don't have a Datasource or Expectation Suite configured."
Expand Down
4 changes: 2 additions & 2 deletions great_expectations/render/renderer/page_renderer.py
Expand Up @@ -186,7 +186,7 @@ def _group_evrs_by_column(
if self._data_context is not None
else None
)
except:
except Exception:
suite_meta = None
meta_properties_to_render = self._get_meta_properties_notes(suite_meta)
for evr in validation_results.results:
Expand Down Expand Up @@ -934,7 +934,7 @@ def __init__(
class_name=column_section_renderer["class_name"],
)

def render(self, validation_results):
def render(self, validation_results): # noqa: C901 - 16
run_id = validation_results.meta["run_id"]
if isinstance(run_id, str):
try:
Expand Down
6 changes: 3 additions & 3 deletions great_expectations/render/renderer/site_builder.py
Expand Up @@ -110,7 +110,7 @@ class SiteBuilder:
class_name: DefaultJinjaIndexPageView
"""

def __init__(
def __init__( # noqa: C901 - 16
self,
data_context,
store_backend,
Expand Down Expand Up @@ -686,15 +686,15 @@ def _get_call_to_action_buttons(self, usage_statistics):
"How to Create Expectations",
"https://docs.greatexpectations.io/docs/guides/expectations/how_to_create_and_edit_expectations_with_instant_feedback_from_a_sample_batch_of_data",
)
see_glossary = CallToActionButton(
_ = CallToActionButton(
"See More Kinds of Expectations",
"https://greatexpectations.io/expectations",
)
validation_playground = CallToActionButton(
"How to Validate Data",
"https://docs.greatexpectations.io/docs/guides/validation/checkpoints/how_to_create_a_new_checkpoint",
)
customize_data_docs = CallToActionButton(
_ = CallToActionButton(
"How to Customize Data Docs",
"https://docs.greatexpectations.io/docs/reference/data_docs#customizing-html-documentation",
)
Expand Down
2 changes: 1 addition & 1 deletion great_expectations/render/renderer/slack_renderer.py
Expand Up @@ -11,7 +11,7 @@ class SlackRenderer(Renderer):
def __init__(self) -> None:
super().__init__()

def render(
def render( # noqa: C901 - 17
self,
validation_result=None,
data_docs_pages=None,
Expand Down
11 changes: 4 additions & 7 deletions setup.cfg
Expand Up @@ -14,6 +14,7 @@ parentdir_prefix = great_expectations-
[flake8]
exclude = .git,
build,
scripts/*,
tests/*,
docs/*,
build/*,
Expand All @@ -22,13 +23,9 @@ exclude = .git,
versioneer*,
examples/*,
# TODO: remove the items below and fix linting issues
great_expectations/checkpoint,
great_expectations/jupyter_ux,
great_expectations/cli,
great_expectations/expectations,
great_expectations/dataset,
great_expectations/render,
scripts/*,
great_expectations/cli, # 11 warnings
great_expectations/expectations, # 122 warnings
great_expectations/dataset, # 52 warnings
per-file-ignores =
*/__init__.py: F401
# E501 - line length (black)
Expand Down

0 comments on commit 6fe0755

Please sign in to comment.