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.

Sign up for GitHub

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

Remove unused @df.setter #440

Merged
merged 2 commits into from
Feb 1, 2022
Merged

Remove unused @df.setter #440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d2c598
Make `_df` a private attribute
andersy005 Feb 1, 2022
7a9a7f5
Reintroduce pydantic.PrivateAttr()
andersy005 Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions intake_esm/cat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ class ESMCatalogModel(pydantic.BaseModel):
catalog_file: pydantic.StrictStr = None
description: pydantic.StrictStr = None
title: pydantic.StrictStr = None
_df: typing.Optional[typing.Any] = pydantic.PrivateAttr()
_df: typing.Optional[pd.DataFrame] = pydantic.PrivateAttr()

class Config:
arbitrary_types_allowed = True
underscore_attrs_are_private = True
validate_all = True
validate_assignment = True

Expand Down Expand Up @@ -242,19 +244,15 @@ def columns_with_iterables(self) -> typing.Set[str]:
)
return {column for column, check in has_iterables.items() if check}

@property
def has_multiple_variable_assets(self) -> bool:
"""Return True if the catalog has multiple variable assets."""
return self.aggregation_control.variable_column_name in self.columns_with_iterables

@property
def df(self) -> pd.DataFrame:
"""Return the dataframe."""
return self._df

@df.setter
def df(self, value: pd.DataFrame) -> None:
self._df = value
@property
def has_multiple_variable_assets(self) -> bool:
"""Return True if the catalog has multiple variable assets."""
return self.aggregation_control.variable_column_name in self.columns_with_iterables

def _cast_agg_columns_with_iterables(self) -> None:
"""Cast all agg_columns with iterables to tuple values so as
Expand Down