From 593eb9d5804c7d341ae2f8111ffe4f4e1d0b52cc Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Fri, 11 Oct 2024 09:49:10 +0100 Subject: [PATCH 1/3] examples: updates and format alignment to notebook names --- .../notebooks/{spm_AdamW.ipynb => adamw_identification.ipynb} | 0 .../{cost-compute-methods.ipynb => cost_compute_methods.ipynb} | 0 ...electrode_design.ipynb => energy_based_electrode_design.ipynb} | 0 ...pulse-circuit-model.ipynb => single-pulse-circuit-model.ipynb} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename examples/notebooks/{spm_AdamW.ipynb => adamw_identification.ipynb} (100%) rename examples/notebooks/{cost-compute-methods.ipynb => cost_compute_methods.ipynb} (100%) rename examples/notebooks/{spm_electrode_design.ipynb => energy_based_electrode_design.ipynb} (100%) rename examples/notebooks/{1-single-pulse-circuit-model.ipynb => single-pulse-circuit-model.ipynb} (100%) diff --git a/examples/notebooks/spm_AdamW.ipynb b/examples/notebooks/adamw_identification.ipynb similarity index 100% rename from examples/notebooks/spm_AdamW.ipynb rename to examples/notebooks/adamw_identification.ipynb diff --git a/examples/notebooks/cost-compute-methods.ipynb b/examples/notebooks/cost_compute_methods.ipynb similarity index 100% rename from examples/notebooks/cost-compute-methods.ipynb rename to examples/notebooks/cost_compute_methods.ipynb diff --git a/examples/notebooks/spm_electrode_design.ipynb b/examples/notebooks/energy_based_electrode_design.ipynb similarity index 100% rename from examples/notebooks/spm_electrode_design.ipynb rename to examples/notebooks/energy_based_electrode_design.ipynb diff --git a/examples/notebooks/1-single-pulse-circuit-model.ipynb b/examples/notebooks/single-pulse-circuit-model.ipynb similarity index 100% rename from examples/notebooks/1-single-pulse-circuit-model.ipynb rename to examples/notebooks/single-pulse-circuit-model.ipynb From c2654392891bf1160a2fdc9fd16914edbf06bdd6 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Fri, 11 Oct 2024 09:51:36 +0100 Subject: [PATCH 2/3] align single_pulse example name --- ...pulse-circuit-model.ipynb => single_pulse_circuit_model.ipynb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/notebooks/{single-pulse-circuit-model.ipynb => single_pulse_circuit_model.ipynb} (100%) diff --git a/examples/notebooks/single-pulse-circuit-model.ipynb b/examples/notebooks/single_pulse_circuit_model.ipynb similarity index 100% rename from examples/notebooks/single-pulse-circuit-model.ipynb rename to examples/notebooks/single_pulse_circuit_model.ipynb From 101f9ce1938b91a80506e1c1dd58f6c61a5af56b Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Fri, 11 Oct 2024 10:08:23 +0100 Subject: [PATCH 3/3] adds FORCE_COLOR env to CI --- .github/workflows/scheduled_tests.yaml | 1 + .github/workflows/test_on_pull_request.yaml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/scheduled_tests.yaml b/.github/workflows/scheduled_tests.yaml index 054ef196d..f8d54a927 100644 --- a/.github/workflows/scheduled_tests.yaml +++ b/.github/workflows/scheduled_tests.yaml @@ -13,6 +13,7 @@ on: # Check noxfile.py for associated environment variables env: PYBOP_SCHEDULED: 1 + FORCE_COLOR: 3 jobs: # Dynamically create a matrix of OS, Python, and PyBaMM versions diff --git a/.github/workflows/test_on_pull_request.yaml b/.github/workflows/test_on_pull_request.yaml index 2f74bbe32..cdad41770 100644 --- a/.github/workflows/test_on_pull_request.yaml +++ b/.github/workflows/test_on_pull_request.yaml @@ -4,6 +4,10 @@ on: workflow_dispatch: pull_request: +# Add colors to nox/pytest +env: + FORCE_COLOR: 3 + concurrency: # github.workflow: name of the workflow, so that we don't cancel other workflows # github.event.pull_request.number || github.ref: pull request number or branch name if not a pull request