Merge branch 'develop' into 526-add-optimisation-check-for-non-finite…

…-cost-parameter-value
pybop-team · Oct 11, 2024 · c8b00e6 · c8b00e6
2 parents 371ae0c + bd061d2
commit c8b00e6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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

diff --git a/examples/notebooks/spm_AdamW.ipynb → ...ples/notebooks/adamw_identification.ipynb b/examples/notebooks/spm_AdamW.ipynb → ...ples/notebooks/adamw_identification.ipynb
diff --git a/...ples/notebooks/cost-compute-methods.ipynb → ...ples/notebooks/cost_compute_methods.ipynb b/...ples/notebooks/cost-compute-methods.ipynb → ...ples/notebooks/cost_compute_methods.ipynb
diff --git a/...ples/notebooks/spm_electrode_design.ipynb → ...books/energy_based_electrode_design.ipynb b/...ples/notebooks/spm_electrode_design.ipynb → ...books/energy_based_electrode_design.ipynb
diff --git a/...ebooks/1-single-pulse-circuit-model.ipynb → ...otebooks/single_pulse_circuit_model.ipynb b/...ebooks/1-single-pulse-circuit-model.ipynb → ...otebooks/single_pulse_circuit_model.ipynb