Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MAINTENANCE] filter RemovedInMarshmallow4 warnings #6602

Merged
merged 10 commits into from Dec 19, 2022
40 changes: 16 additions & 24 deletions great_expectations/data_context/types/base.py
Expand Up @@ -28,7 +28,6 @@
from ruamel.yaml.compat import StringIO

import great_expectations.exceptions as ge_exceptions
from great_expectations import deprecation_wrappers
from great_expectations.core.batch import BatchRequestBase, get_batch_request_as_dict
from great_expectations.core.configuration import AbstractConfig, AbstractConfigSchema
from great_expectations.core.run_identifier import RunIdentifier
Expand Down Expand Up @@ -239,42 +238,37 @@ class Meta:
required=True,
allow_none=False,
)
module_name = deprecation_wrappers.mm_field(
fields.String,
module_name = fields.String(
required=False,
allow_none=True,
load_default="great_expectations.datasource.data_connector.sorter",
missing="great_expectations.datasource.data_connector.sorter",
)
orderby = deprecation_wrappers.mm_field(
fields.String,
orderby = fields.String(
required=False,
allow_none=True,
load_default="asc",
missing="asc",
)

# allow_none = True because it is only used by some Sorters
reference_list = deprecation_wrappers.mm_field(
fields.List,
reference_list = fields.List(
cls_or_instance=fields.Str(),
required=False,
load_default=None,
missing=None,
allow_none=True,
)
order_keys_by = fields.String(
required=False,
allow_none=True,
)
key_reference_list = deprecation_wrappers.mm_field(
fields.List,
key_reference_list = fields.List(
cls_or_instance=fields.Str(),
required=False,
load_default=None,
missing=None,
allow_none=True,
)
datetime_format = deprecation_wrappers.mm_field(
fields.String,
datetime_format = fields.String(
required=False,
load_default=None,
missing=None,
allow_none=True,
)

Expand Down Expand Up @@ -368,17 +362,15 @@ class Meta:
unknown = INCLUDE

name = fields.String(required=False, allow_none=True)
class_name = deprecation_wrappers.mm_field(
fields.String,
class_name = fields.String(
required=False,
allow_none=True,
load_default="Asset",
missing="Asset",
)
module_name = deprecation_wrappers.mm_field(
fields.String,
module_name = fields.String(
required=False,
metadata={"all_none": True},
load_default="great_expectations.datasource.data_connector.asset",
all_none=True,
missing="great_expectations.datasource.data_connector.asset",
)
base_directory = fields.String(required=False, allow_none=True)
glob_directive = fields.String(required=False, allow_none=True)
Expand Down Expand Up @@ -990,7 +982,7 @@ class Meta:
module_name = fields.String(
required=False,
allow_none=True,
load_default="great_expectations.execution_engine",
missing="great_expectations.execution_engine",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we forgot to revert this use of missing as part of #6271

)
connection_string = fields.String(required=False, allow_none=True)
credentials = fields.Raw(required=False, allow_none=True)
Expand Down
63 changes: 0 additions & 63 deletions great_expectations/deprecation_wrappers.py

This file was deleted.