Skip to content

Update JuliaFormatter to v2.10.1 #337

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

Merged
nefrathenrici merged 1 commit into from
Jul 10, 2026
Merged

Update JuliaFormatter to v2.10.1 #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/julia_formatter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
steps:
- uses: julia-actions/julia-format@v3
with:
version: '1' # Set `version` to '1.0.54' if you need to use JuliaFormatter.jl v1.0.54 (default: '1')
version: '2.10.1'
suggestion-label: 'format-suggest' # leave this unset or empty to show suggestions for all PRs
49 changes: 23 additions & 26 deletions ext/observation_recipe.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,13 @@ function _covariance(
diag_cov .*= covar_estimator.scalar

if covar_estimator.use_latitude_weights
flattened_lat_weights =
ClimaAnalysis.flatten(
_lat_weights_var(
var,
min_cosd_lat = covar_estimator.min_cosd_lat,
);
dims,
).data
flattened_lat_weights = ClimaAnalysis.flatten(
_lat_weights_var(
var,
min_cosd_lat = covar_estimator.min_cosd_lat,
);
dims,
).data
diag_cov .*= flattened_lat_weights
end
diag_cov
Expand Down Expand Up @@ -195,14 +194,13 @@ function ObservationRecipe.covariance(

# Add latitude weights
if covar_estimator.use_latitude_weights
flattened_lat_weights =
ClimaAnalysis.flatten(
_lat_weights_var(
seasonal_variance_var,
min_cosd_lat = covar_estimator.min_cosd_lat,
);
dims,
).data
flattened_lat_weights = ClimaAnalysis.flatten(
_lat_weights_var(
seasonal_variance_var,
min_cosd_lat = covar_estimator.min_cosd_lat,
);
dims,
).data
diag_cov .*= flattened_lat_weights
end
diag_cov
Expand Down Expand Up @@ -667,16 +665,15 @@ function _metadata_for_stacked_sample(vars, sample_date_ranges, dims)
sample_start_date, sample_end_date = first(sample_date_ranges)
metadata = []
for var in vars
md =
ClimaAnalysis.flatten(
ClimaAnalysis.window(
var,
"time",
left = sample_start_date,
right = sample_end_date,
);
dims,
).metadata
md = ClimaAnalysis.flatten(
ClimaAnalysis.window(
var,
"time",
left = sample_start_date,
right = sample_end_date,
);
dims,
).metadata
push!(metadata, md)
end
return metadata
Expand Down
2 changes: 1 addition & 1 deletion src/ekp_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ If no iteration has been completed yet, return 0.
function last_completed_iteration(output_dir)
last_completed_iter = 0
while isfile(path_to_G_ensemble(output_dir, last_completed_iter + 1)) &&
isfile(ekp_path(output_dir, last_completed_iter + 2))
isfile(ekp_path(output_dir, last_completed_iter + 2))
last_completed_iter += 1
end
return last_completed_iter
Expand Down
27 changes: 12 additions & 15 deletions test/ensemble_builder.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,10 @@ end
@testset "Use GEnsembleBuilder for a fake calibration" begin
pkgversion(EnsembleKalmanProcesses) > v"2.4.3" || return

time =
ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:11],
)
time = ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:11],
)
time_var =
TemplateVar() |>
add_dim("time", time, units = "s") |>
Expand Down Expand Up @@ -558,11 +557,10 @@ end
end

@testset "Utilities functions" begin
time =
ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:11],
)
time = ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:11],
)
time_var =
TemplateVar() |>
add_dim("time", time, units = "s") |>
Expand Down Expand Up @@ -631,11 +629,10 @@ end
end

@testset "Error handling when constructing GEnsembleBuilder" begin
time =
ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:4],
)
time = ClimaAnalysis.Utils.date_to_time.(
Dates.DateTime(2007, 12),
[Dates.DateTime(2007, 12) + Dates.Month(3 * i) for i in 0:4],
)
time_var =
TemplateVar() |>
add_dim("time", time, units = "s") |>
Expand Down
Loading
Loading