Skip to content

Commit 270d099

Browse files
authored
Merge pull request #481 from Climate-REF/dependabot/uv/python-dependencies-cbfbb3c6eb
2 parents 3b6d9e1 + 57ea206 commit 270d099

8 files changed

Lines changed: 395 additions & 240 deletions

File tree

changelog/480.trivial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
oIgnore changelog requirement for dependabot PRs
1+
Ignore changelog requirement for dependabot PRs

packages/climate-ref-example/src/climate_ref_example/example.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,11 @@ def execute(self, definition: ExecutionDefinition) -> None:
168168

169169
input_datasets = definition.datasets[SourceDatasetType.CMIP6]
170170

171-
calculate_annual_mean_timeseries(input_files=input_datasets.path.to_list()).to_netcdf(
172-
definition.output_directory / "annual_mean_global_mean_timeseries.nc"
173-
)
171+
result = calculate_annual_mean_timeseries(input_files=input_datasets.path.to_list())
172+
# Drop time_bnds to avoid xarray cftime bounds encoding regression (xarray >= 2025.11.0)
173+
if "time_bnds" in result:
174+
result = result.drop_vars("time_bnds")
175+
result.to_netcdf(definition.output_directory / "annual_mean_global_mean_timeseries.nc")
174176

175177
def build_execution_result(self, definition: ExecutionDefinition) -> ExecutionResult:
176178
"""

packages/climate-ref-ilamb/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ classifiers = [
2525
dependencies = [
2626
"climate-ref-core",
2727
"ilamb3>=2025.9.9",
28-
"scipy<1.16", # https://github.com/statsmodels/statsmodels/issues/9584
28+
"scipy<1.16", # https://github.com/statsmodels/statsmodels/issues/9584
29+
"xarray<2025.11", # ilamb3 incompatibility with integrate_space units handling
2930
]
3031
[project.entry-points."climate-ref.providers"]
3132
ilamb = "climate_ref_ilamb:provider"

packages/climate-ref/src/climate_ref/datasets/base.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ def register_dataset( # noqa: PLR0915
219219
slug = unique_slugs[0]
220220

221221
# Upsert the dataset (create a new dataset or update the metadata)
222-
dataset_metadata = data_catalog_dataset[list(self.dataset_specific_metadata)].iloc[0].to_dict()
222+
dataset_metadata = cast(
223+
dict[str, Any], data_catalog_dataset[list(self.dataset_specific_metadata)].iloc[0].to_dict()
224+
)
223225
dataset, dataset_state = db.update_or_create(DatasetModel, defaults=dataset_metadata, slug=slug)
224226
if dataset_state == ModelState.CREATED:
225227
logger.info(f"Created new dataset: {dataset}")

packages/climate-ref/src/climate_ref/datasets/cmip6.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def _fix_parent_variant_label(group: pd.DataFrame) -> pd.DataFrame:
5353
if "parent_variant_label" in data_catalog:
5454
data_catalog = (
5555
data_catalog.groupby("instance_id")
56-
.apply(_fix_parent_variant_label, include_groups=False)
56+
.apply(_fix_parent_variant_label, include_groups=False) # type: ignore[call-overload]
5757
.reset_index(level="instance_id")
5858
)
5959

packages/climate-ref/src/climate_ref/solver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def extract_covered_datasets(
130130
# Use a single group
131131
groups = [((), subset)]
132132
else:
133-
groups = list(subset.groupby(list(requirement.group_by)))
133+
groups = list(subset.groupby(list(requirement.group_by))) # type: ignore[arg-type]
134134

135135
results = {}
136136

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dev = [
4747
"mkdocs-autorefs>=1.0.1",
4848
"mkdocs-jupyter>=0.24.0",
4949
"mkdocs-panzoom-plugin>=0.1.3",
50-
"beautifulsoup4>=4.12,<4.13",
50+
"beautifulsoup4>=4.12,<4.15",
5151
"cartopy>=0.24.1",
5252
"intake-esgf>=2025.7.16",
5353
"ipython>=9.2.0",

uv.lock

Lines changed: 381 additions & 231 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)