From 58ce82589070f15c0039eff62c692f48aa50fd8e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:31:32 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) - https://github.com/charliermarsh/ruff-pre-commit → https://github.com/astral-sh/ruff-pre-commit - [github.com/astral-sh/ruff-pre-commit: v0.0.253 → v0.1.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.253...v0.1.6) - [github.com/psf/black: 22.6.0 → 23.11.0](https://github.com/psf/black/compare/22.6.0...23.11.0) - [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.4 → v3.1.0](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.4...v3.1.0) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 936de2a..cf5b5df 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: # list of supported hooks: https://pre-commit.com/hooks.html - id: trailing-whitespace @@ -12,20 +12,20 @@ repos: - id: detect-private-key # python code formatting/linting - - repo: https://github.com/charliermarsh/ruff-pre-commit + - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: "v0.0.253" + rev: "v0.1.6" hooks: - id: ruff args: [--fix] - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 23.11.0 hooks: - id: black args: [--line-length, "100"] # yaml formatting - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.4 + rev: v3.1.0 hooks: - id: prettier types: [yaml] From c62ab66874ce020fc9029dcfd678635604cdd78a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:31:58 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- notebooks/good_and_bad_results.py | 1 - nowcasting_utils/metrics/plot.py | 6 ------ nowcasting_utils/metrics/validation.py | 1 - nowcasting_utils/visualization/data_sources/plot_gsp.py | 1 - nowcasting_utils/visualization/data_sources/plot_pv.py | 1 - nowcasting_utils/visualization/line.py | 1 - scripts/plot-satellite.py | 1 - scripts/plot_nwp.py | 1 - 8 files changed, 13 deletions(-) diff --git a/notebooks/good_and_bad_results.py b/notebooks/good_and_bad_results.py index c5be77b..a35ef02 100644 --- a/notebooks/good_and_bad_results.py +++ b/notebooks/good_and_bad_results.py @@ -28,7 +28,6 @@ traces = [] subplot_titles = [] for i in range(len(all_indexes)): - print(i) index = all_indexes[i] % 32 diff --git a/nowcasting_utils/metrics/plot.py b/nowcasting_utils/metrics/plot.py index 572e078..a551b6d 100644 --- a/nowcasting_utils/metrics/plot.py +++ b/nowcasting_utils/metrics/plot.py @@ -63,7 +63,6 @@ def make_forecast_horizon_metrics(results_df, normalize: bool = False) -> List[g forecast_horizon_metrics = {} # loop over the number of forecast horizons for i in range(n_forecast_hoirzons): - forecast_horizon = (i + 1) * time_delta forecast_horizon_hours = forecast_horizon.seconds / 3600 @@ -92,7 +91,6 @@ def make_forecast_horizon_metrics(results_df, normalize: bool = False) -> List[g trace_forecast_horizons = [] # loop over the different columns / metrics and plot them for i in range(len(plotting_metrics)): - col = plotting_metrics[i] colour = colours[i] @@ -127,7 +125,6 @@ def make_gsp_id_metrics( n_gsp_ids = int(results_df["gsp_id"].max()) gsp_metrics = {} for i in range(n_gsp_ids): - gsp_id = i + 1 results_df_one_forecast_hoirzon = results_df[results_df["gsp_id"] == gsp_id] @@ -146,7 +143,6 @@ def make_gsp_id_metrics( # plot metrics trace_gsp_id = [] for i in range(len(plotting_metrics)): - col = plotting_metrics[i] colour = colours[i] @@ -202,7 +198,6 @@ def make_t0_datetime_utc_metrics(results_df, normalize: bool = False) -> (go.Sca ) for i in range(len(target_datetimes_utc)): - target_datetime_utc = target_datetimes_utc[i] results_df_one_datetime = results_df[ @@ -221,7 +216,6 @@ def make_t0_datetime_utc_metrics(results_df, normalize: bool = False) -> (go.Sca # plot metrics trace_gsp_id = [] for i in range(len(plotting_metrics)): - col = plotting_metrics[i] colour = colours[i] diff --git a/nowcasting_utils/metrics/validation.py b/nowcasting_utils/metrics/validation.py index e7ef27b..4ea3eec 100644 --- a/nowcasting_utils/metrics/validation.py +++ b/nowcasting_utils/metrics/validation.py @@ -51,7 +51,6 @@ def make_validation_results( # TODO #64 vectorize n_forecast_timesteps = predictions_mw.shape[1] for i in range(n_forecast_timesteps): - if len(capacity_mwp.shape) == 1: capacity_time_step = capacity_mwp else: diff --git a/nowcasting_utils/visualization/data_sources/plot_gsp.py b/nowcasting_utils/visualization/data_sources/plot_gsp.py index e95ba02..81da439 100644 --- a/nowcasting_utils/visualization/data_sources/plot_gsp.py +++ b/nowcasting_utils/visualization/data_sources/plot_gsp.py @@ -68,7 +68,6 @@ def get_traces_gsp_intensity(gsp: GSP, example_index: int): traces = [] for t_index in range(len(time)): - trace = get_trace_gsp_intensity_one_time_step( gsp=gsp, example_index=example_index, t_index=t_index ) diff --git a/nowcasting_utils/visualization/data_sources/plot_pv.py b/nowcasting_utils/visualization/data_sources/plot_pv.py index f3a2f8a..14ced31 100644 --- a/nowcasting_utils/visualization/data_sources/plot_pv.py +++ b/nowcasting_utils/visualization/data_sources/plot_pv.py @@ -64,7 +64,6 @@ def get_traces_pv_intensity(pv: PV, example_index: int): traces = [go.Choroplethmapbox(colorscale="Viridis")] for t_index in range(len(time)): - trace = get_trace_pv_intensity_one_time_step( pv=pv, example_index=example_index, t_index=t_index ) diff --git a/nowcasting_utils/visualization/line.py b/nowcasting_utils/visualization/line.py index a6386ae..a85b11c 100644 --- a/nowcasting_utils/visualization/line.py +++ b/nowcasting_utils/visualization/line.py @@ -118,7 +118,6 @@ def plot_batch_results( fig.layout.annotations[-1]["yanchor"] = "bottom" for i in range(0, batchsize): - row = i // N + 1 col = i % N + 1 diff --git a/scripts/plot-satellite.py b/scripts/plot-satellite.py index 4599ddf..cf0bb13 100644 --- a/scripts/plot-satellite.py +++ b/scripts/plot-satellite.py @@ -26,7 +26,6 @@ # loop over examples for example_index in range(11, 13): - x = satellite.x[example_index].mean() y = satellite.y[example_index].mean() diff --git a/scripts/plot_nwp.py b/scripts/plot_nwp.py index 64bacc9..a4c399a 100644 --- a/scripts/plot_nwp.py +++ b/scripts/plot_nwp.py @@ -52,7 +52,6 @@ # loop over examples for example_index in range(5, 6): - x = nwp.x[example_index].mean() y = nwp.y[example_index].mean()