From f25b957f5b9cc2ed61be7884106cc9ff80fa5d46 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Tue, 7 Nov 2023 21:43:37 +0530
Subject: [PATCH 01/21] Fix `gfortran` installation

for #3475
---
 .github/workflows/run_periodic_tests.yml | 11 +++--------
 .github/workflows/test_on_push.yml       |  4 ++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
index f6e51bc11b..2fdf19f56d 100644
--- a/.github/workflows/run_periodic_tests.yml
+++ b/.github/workflows/run_periodic_tests.yml
@@ -66,19 +66,14 @@ jobs:
           sudo apt install gfortran gcc libopenblas-dev graphviz pandoc
           sudo apt install texlive-full
 
-      # Added fixes to homebrew installs:
-      # rm -f /usr/local/bin/2to3
-      # (see https://github.com/actions/virtual-environments/issues/2322)
+      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
       - name: Install MacOS system dependencies
         if: matrix.os == 'macos-latest'
-        run: |
-          rm -f /usr/local/bin/2to3*
-          rm -f /usr/local/bin/idle3*
-          rm -f /usr/local/bin/pydoc3*
-          rm -f /usr/local/bin/python3*
+        run:
           brew update
           brew install graphviz
           brew install openblas
+          brew reinstall gcc
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'
diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index cb22fb87f7..1ccdb48213 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -64,6 +64,7 @@ jobs:
           sudo dot -c
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
+      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
       - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         env:
@@ -77,6 +78,7 @@ jobs:
           brew analytics off
           brew update
           brew install graphviz openblas
+          brew reinstall gcc
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'
@@ -207,6 +209,7 @@ jobs:
           sudo dot -c
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
+      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
       - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         env:
@@ -220,6 +223,7 @@ jobs:
           brew analytics off
           brew update
           brew install graphviz openblas
+          brew reinstall gcc
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'

From 65a81e37175849fae9cba876799802e6c62fe556 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Tue, 7 Nov 2023 22:45:33 +0530
Subject: [PATCH 02/21] Re-install OpenBLAS `scipy` meson linkage errors

---
 .github/workflows/run_periodic_tests.yml | 2 +-
 .github/workflows/test_on_push.yml       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
index 2fdf19f56d..2322adf993 100644
--- a/.github/workflows/run_periodic_tests.yml
+++ b/.github/workflows/run_periodic_tests.yml
@@ -72,7 +72,7 @@ jobs:
         run:
           brew update
           brew install graphviz
-          brew install openblas
+          brew reinstall openblas
           brew reinstall gcc
 
       - name: Install Windows system dependencies
diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 1ccdb48213..df114224b3 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -222,8 +222,9 @@ jobs:
         run: |
           brew analytics off
           brew update
-          brew install graphviz openblas
+          brew install graphviz
           brew reinstall gcc
+          brew reinstall openblas
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'

From 3aa79ca2d44f2f7298504a5a20e96d72558e27cc Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 18:28:27 +0530
Subject: [PATCH 03/21] Temporarily remove lower bounds: `numpy`, `scipy`

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index f6fd37f75c..70bb69a56e 100644
--- a/setup.py
+++ b/setup.py
@@ -203,9 +203,9 @@ def compile_KLU():
     ],
     # List of dependencies
     install_requires=[
-        "numpy>=1.16",
-        "scipy>=1.3",
-        "casadi>=3.6.0",
+        "numpy",
+        "scipy",
+        "casadi",
         "xarray",
     ],
     extras_require={

From 8782a7af8f713e7802f07d3e68b2562469036075 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 18:55:52 +0530
Subject: [PATCH 04/21] Exercise minimum version bounds: `numpy`, `scipy`, and
 `casadi`

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 70bb69a56e..87dd89ec6b 100644
--- a/setup.py
+++ b/setup.py
@@ -203,9 +203,9 @@ def compile_KLU():
     ],
     # List of dependencies
     install_requires=[
-        "numpy",
-        "scipy",
-        "casadi",
+        "numpy>=1.24.4",
+        "scipy>=1.10.1",
+        "casadi>=3.6.3",
         "xarray",
     ],
     extras_require={

From dc1f6eddd4e8e838628ef496ce3d4d9a2a30ac79 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 18:56:10 +0530
Subject: [PATCH 05/21] Remove redundant PyBaMM dependencies caching step

---
 .github/workflows/test_on_push.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index df114224b3..2def84a60c 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -92,10 +92,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -e .[all,docs]
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -152,10 +151,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools nox
-          pip install -e .[all,docs]
+          pip install --upgrade pip wheel setuptools
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -238,10 +236,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -e .[all,docs]
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -299,10 +296,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -e .[all,docs]
 
       - name: Install docs dependencies and run doctests for GNU/Linux with Python 3.11
         run: pipx run nox -s doctests
@@ -344,10 +340,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -e .[all,docs]
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -402,10 +397,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install PyBaMM dependencies
+      - name: Install Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -e .[all,docs]
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3

From 5a6f03cf8a308e6598b428f8631c647db11e1711 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 19:32:12 +0530
Subject: [PATCH 06/21] Add a lower bound for `sympy`

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 87dd89ec6b..0335c89f77 100644
--- a/setup.py
+++ b/setup.py
@@ -241,7 +241,7 @@ def compile_KLU():
             "pybtex>=0.24.0",
         ],
         "latexify": [
-            "sympy>=1.8",
+            "sympy>=1.12",
         ],
         "bpx": [
             "bpx",

From 844fcec79a23248b3aa74adde3f9f61484da997b Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 20:32:31 +0530
Subject: [PATCH 07/21] Clean up `brew` changes and re-trigger build

---
 .github/workflows/test_on_push.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 2def84a60c..b660f0a7c9 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -64,7 +64,6 @@ jobs:
           sudo dot -c
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
-      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
       - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         env:
@@ -78,7 +77,6 @@ jobs:
           brew analytics off
           brew update
           brew install graphviz openblas
-          brew reinstall gcc
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'
@@ -92,7 +90,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 
@@ -151,7 +149,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 
@@ -207,7 +205,6 @@ jobs:
           sudo dot -c
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
-      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
       - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         env:
@@ -220,9 +217,7 @@ jobs:
         run: |
           brew analytics off
           brew update
-          brew install graphviz
-          brew reinstall gcc
-          brew reinstall openblas
+          brew install graphviz openblas
 
       - name: Install Windows system dependencies
         if: matrix.os == 'windows-latest'
@@ -236,7 +231,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 
@@ -296,7 +291,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 
@@ -340,7 +335,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 
@@ -397,7 +392,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: setup.py
 
-      - name: Install Python dependencies
+      - name: Install standard Python dependencies
         run: |
           pip install --upgrade pip wheel setuptools
 

From c7aa1172dc8f3b3d9b7846fb0eabce5cc7f299ee Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 9 Nov 2023 20:39:08 +0530
Subject: [PATCH 08/21] Update `sympy>=1.12` for the `[all]` extra as well

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0335c89f77..8bc6437945 100644
--- a/setup.py
+++ b/setup.py
@@ -276,7 +276,7 @@ def compile_KLU():
             "scikit-fem>=0.2.0",
             "imageio>=2.9.0",
             "pybtex>=0.24.0",
-            "sympy>=1.8",
+            "sympy>=1.12",
             "bpx",
             "tqdm",
             "matplotlib>=2.0",

From 9e69391d9ea2476f2345c9425bb1f44113af5ecd Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 01:07:45 +0530
Subject: [PATCH 09/21] Remove reinstall of OpenBLAS for scheduled tests

---
 .github/workflows/run_periodic_tests.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
index 2322adf993..06bd358f71 100644
--- a/.github/workflows/run_periodic_tests.yml
+++ b/.github/workflows/run_periodic_tests.yml
@@ -66,13 +66,11 @@ jobs:
           sudo apt install gfortran gcc libopenblas-dev graphviz pandoc
           sudo apt install texlive-full
 
-      # sometimes gfortran cannot be found, so reinstall gcc just to be sure
-      - name: Install MacOS system dependencies
+      - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         run:
           brew update
-          brew install graphviz
-          brew reinstall openblas
+          brew install graphviz openblas
           brew reinstall gcc
 
       - name: Install Windows system dependencies

From f87b6bf5c8306581cdc4ed1e2f4fda3d61f077e4 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 01:09:54 +0530
Subject: [PATCH 10/21] Temporarily remove `pip` wheel caches and test

---
 .github/workflows/test_on_push.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index b660f0a7c9..8a97bdffc8 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -87,8 +87,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -146,8 +144,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -228,8 +224,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -288,8 +282,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -332,8 +324,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -389,8 +379,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-          cache: 'pip'
-          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |

From 778d2a4b756b83afce0d5709c6956678e8f48263 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 01:21:58 +0530
Subject: [PATCH 11/21] Don't run "brew update" in CI

---
 .github/workflows/run_periodic_tests.yml | 1 -
 .github/workflows/test_on_push.yml       | 2 --
 2 files changed, 3 deletions(-)

diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
index 06bd358f71..8e3a8b2644 100644
--- a/.github/workflows/run_periodic_tests.yml
+++ b/.github/workflows/run_periodic_tests.yml
@@ -69,7 +69,6 @@ jobs:
       - name: Install macOS system dependencies
         if: matrix.os == 'macos-latest'
         run:
-          brew update
           brew install graphviz openblas
           brew reinstall gcc
 
diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 8a97bdffc8..e948337b3b 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -75,7 +75,6 @@ jobs:
           NONINTERACTIVE: 1
         run: |
           brew analytics off
-          brew update
           brew install graphviz openblas
 
       - name: Install Windows system dependencies
@@ -212,7 +211,6 @@ jobs:
           NONINTERACTIVE: 1
         run: |
           brew analytics off
-          brew update
           brew install graphviz openblas
 
       - name: Install Windows system dependencies

From 9098bf0f7290087724ce7c4197be4f62103ceb8c Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 01:45:28 +0530
Subject: [PATCH 12/21] Even lower bounds for NumPy and SciPy

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 8bc6437945..bf69298c08 100644
--- a/setup.py
+++ b/setup.py
@@ -203,8 +203,8 @@ def compile_KLU():
     ],
     # List of dependencies
     install_requires=[
-        "numpy>=1.24.4",
-        "scipy>=1.10.1",
+        "numpy>=1.18.5",
+        "scipy>=1.9.3",
         "casadi>=3.6.3",
         "xarray",
     ],

From b0dc5f9803ad4febc944a190b54b8fb86d8b64b5 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 02:16:01 +0530
Subject: [PATCH 13/21] Exercise tighter lower bounds for dependencies

---
 setup.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index 7dfd713a34..1ec40d9637 100644
--- a/setup.py
+++ b/setup.py
@@ -203,11 +203,11 @@ def compile_KLU():
     ],
     # List of dependencies
     install_requires=[
-        "numpy>=1.18.5",
-        "scipy>=1.9.3",
+        "numpy>=1.24.4",
+        "scipy>=1.10.1",
         "casadi>=3.6.3",
-        "xarray",
-        "anytree>=2.4.3",
+        "xarray>=2023.1.0",
+        "anytree>=2.12.0",
     ],
     extras_require={
         "docs": [
@@ -231,12 +231,12 @@ def compile_KLU():
             "jupyter",  # For example notebooks
         ],
         "plot": [
-            "imageio>=2.9.0",
+            "imageio>=2.32.0",
             # Note: Matplotlib is loaded for debug plots, but to ensure pybamm runs
             # on systems without an attached display, it should never be imported
             # outside of plot() methods.
             # Should not be imported
-            "matplotlib>=2.0",
+            "matplotlib>=3.7.3",
         ],
         "cite": [
             "pybtex>=0.24.0",
@@ -263,7 +263,7 @@ def compile_KLU():
             "nbmake",
         ],
         "pandas": [
-            "pandas>=0.24",
+            "pandas>=2.0.3",
         ],
         "jax": [
             "jax==0.4.8",
@@ -271,16 +271,16 @@ def compile_KLU():
         ],
         "odes": ["scikits.odes"],
         "all": [
-            "anytree>=2.4.3",
-            "autograd>=1.2",
-            "pandas>=0.24",
-            "scikit-fem>=0.2.0",
-            "imageio>=2.9.0",
+            "anytree>=2.12.0",
+            "autograd>=1.6.2",
+            "pandas>=2.0.3",
+            "scikit-fem>=8.1.0",
+            "imageio>=2.32.0",
             "pybtex>=0.24.0",
             "sympy>=1.12",
             "bpx",
             "tqdm",
-            "matplotlib>=2.0",
+            "matplotlib>=3.7.3",
             "jupyter",
         ],
     },

From 2b8e225e6813ee44f12111a8f92889eeade56392 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 02:23:19 +0530
Subject: [PATCH 14/21] Add recursive optional dependencies

---
 setup.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 1ec40d9637..9ff587f5ea 100644
--- a/setup.py
+++ b/setup.py
@@ -271,17 +271,9 @@ def compile_KLU():
         ],
         "odes": ["scikits.odes"],
         "all": [
-            "anytree>=2.12.0",
             "autograd>=1.6.2",
-            "pandas>=2.0.3",
             "scikit-fem>=8.1.0",
-            "imageio>=2.32.0",
-            "pybtex>=0.24.0",
-            "sympy>=1.12",
-            "bpx",
-            "tqdm",
-            "matplotlib>=3.7.3",
-            "jupyter",
+            "pybamm[examples,plot,cite,latexify,bpx,tqdm,pandas]"
         ],
     },
     entry_points={

From 66037ab035beb3070d82b8ff37ced1ccb61e743f Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 02:54:56 +0530
Subject: [PATCH 15/21] Remove bounds for `xarray` and `pandas`

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 9ff587f5ea..26396805c8 100644
--- a/setup.py
+++ b/setup.py
@@ -206,7 +206,7 @@ def compile_KLU():
         "numpy>=1.24.4",
         "scipy>=1.10.1",
         "casadi>=3.6.3",
-        "xarray>=2023.1.0",
+        "xarray",
         "anytree>=2.12.0",
     ],
     extras_require={
@@ -263,7 +263,7 @@ def compile_KLU():
             "nbmake",
         ],
         "pandas": [
-            "pandas>=2.0.3",
+            "pandas",
         ],
         "jax": [
             "jax==0.4.8",

From f7266365d5b183955421a67c54d537aced97008c Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 16:16:24 +0530
Subject: [PATCH 16/21] Use `python -m nox` instead of `pipx run nox`

---
 .github/workflows/run_periodic_tests.yml | 18 ++++++------
 .github/workflows/test_on_push.yml       | 36 ++++++++++++------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
index 8e3a8b2644..06c0f0fb68 100644
--- a/.github/workflows/run_periodic_tests.yml
+++ b/.github/workflows/run_periodic_tests.yml
@@ -78,42 +78,42 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          python -m pip install --upgrade pip wheel setuptools
+          python -m pip install --upgrade pip wheel setuptools nox
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Run unit tests for GNU/Linux with Python 3.8, 3.9, and 3.10, and for macOS and Windows with all Python versions
         if: (matrix.os == 'ubuntu-latest' && matrix.python-version != 3.11) || (matrix.os != 'ubuntu-latest')
-        run: pipx run nox -s unit
+        run: python -m nox -s unit
 
       - name: Run unit tests for GNU/Linux with Python 3.11 and generate coverage report
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11
-        run: pipx run nox -s coverage
+        run: python -m nox -s coverage
 
       - name: Upload coverage report
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11
         uses: codecov/codecov-action@v3.1.4
 
       - name: Run integration tests
-        run: pipx run nox -s integration
+        run: python -m nox -s integration
 
       - name: Install docs dependencies and run doctests
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s doctests
+        run: python -m nox -s doctests
 
       - name: Check if the documentation can be built
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s docs
+        run: python -m nox -s docs
 
       - name: Install dev dependencies and run example tests
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s examples
+        run: python -m nox -s examples
 
       - name: Run example scripts tests
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s scripts
+        run: python -m nox -s scripts
 
   #M-series Mac Mini
   build-apple-mseries:
diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 38735a15f5..09a98b1131 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -89,7 +89,7 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -107,10 +107,10 @@ jobs:
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Run unit tests for ${{ matrix.os }} with Python ${{ matrix.python-version }}
-        run: pipx run nox -s unit
+        run: python -m nox -s unit
 
   # Runs only on Ubuntu with Python 3.11
   check_coverage:
@@ -146,7 +146,7 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -162,10 +162,10 @@ jobs:
           key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Run unit tests for Ubuntu with Python 3.11 and generate coverage report
-        run: pipx run nox -s coverage
+        run: python -m nox -s coverage
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v3.1.4
@@ -225,7 +225,7 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -243,10 +243,10 @@ jobs:
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Run integration tests for ${{ matrix.os }} with Python ${{ matrix.python-version }}
-        run: pipx run nox -s integration
+        run: python -m nox -s integration
 
 # Runs only on Ubuntu with Python 3.11. Skips IDAKLU module compilation
 # for speedups, which is already tested in other jobs.
@@ -283,13 +283,13 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Install docs dependencies and run doctests for GNU/Linux with Python 3.11
-        run: pipx run nox -s doctests
+        run: python -m nox -s doctests
 
       - name: Check if the documentation can be built for GNU/Linux with Python 3.11
-        run: pipx run nox -s docs
+        run: python -m nox -s docs
 
   # Runs only on Ubuntu with Python 3.11
   run_example_tests:
@@ -325,7 +325,7 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -341,10 +341,10 @@ jobs:
           key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Install dev dependencies and run example tests for GNU/Linux with Python 3.11
-        run: pipx run nox -s examples
+        run: python -m nox -s examples
 
   # Runs only on Ubuntu with Python 3.11
   run_scripts_tests:
@@ -380,7 +380,7 @@ jobs:
 
       - name: Install standard Python dependencies
         run: |
-          pip install --upgrade pip wheel setuptools
+          pip install --upgrade pip wheel setuptools nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
         uses: actions/cache@v3
@@ -396,7 +396,7 @@ jobs:
           key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        run: pipx run nox -s pybamm-requires
+        run: python -m nox -s pybamm-requires
 
       - name: Install dev dependencies and run example scripts tests for GNU/Linux with Python 3.11
-        run: pipx run nox -s scripts
+        run: python -m nox -s scripts

From 363c6f11d0cf01b503c92441e8e6dfc7eeb029e5 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 16:24:28 +0530
Subject: [PATCH 17/21] Temporarily remove cache, let Linux tests run

---
 .github/workflows/test_on_push.yml | 124 ++++++++++++++---------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 09a98b1131..eb366a024a 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -91,19 +91,19 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      - name: Cache pybamm-requires nox environment for GNU/Linux
-        uses: actions/cache@v3
-        if: matrix.os == 'ubuntu-latest'
-        with:
-          path: |
-            # Repository files
-            ${{ github.workspace }}/pybind11/
-            ${{ github.workspace }}/install_KLU_Sundials/
-            # Headers and dynamic library files for SuiteSparse and SUNDIALS
-            ${{ env.HOME }}/.local/lib/
-            ${{ env.HOME }}/.local/include/
-            ${{ env.HOME }}/.local/examples/
-          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      # - name: Cache pybamm-requires nox environment for GNU/Linux
+      #   uses: actions/cache@v3
+      #   if: matrix.os == 'ubuntu-latest'
+      #   with:
+      #     path: |
+      #       # Repository files
+      #       ${{ github.workspace }}/pybind11/
+      #       ${{ github.workspace }}/install_KLU_Sundials/
+      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
+      #       ${{ env.HOME }}/.local/lib/
+      #       ${{ env.HOME }}/.local/include/
+      #       ${{ env.HOME }}/.local/examples/
+      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
@@ -148,18 +148,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      - name: Cache pybamm-requires nox environment for GNU/Linux
-        uses: actions/cache@v3
-        with:
-          path: |
-            # Repository files
-            ${{ github.workspace }}/pybind11/
-            ${{ github.workspace }}/install_KLU_Sundials/
-            # Headers and dynamic library files for SuiteSparse and SUNDIALS
-            ${{ env.HOME }}/.local/lib/
-            ${{ env.HOME }}/.local/include/
-            ${{ env.HOME }}/.local/examples/
-          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      # - name: Cache pybamm-requires nox environment for GNU/Linux
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       # Repository files
+      #       ${{ github.workspace }}/pybind11/
+      #       ${{ github.workspace }}/install_KLU_Sundials/
+      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
+      #       ${{ env.HOME }}/.local/lib/
+      #       ${{ env.HOME }}/.local/include/
+      #       ${{ env.HOME }}/.local/examples/
+      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires
@@ -227,19 +227,19 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      - name: Cache pybamm-requires nox environment for GNU/Linux
-        uses: actions/cache@v3
-        if: matrix.os == 'ubuntu-latest'
-        with:
-          path: |
-            # Repository files
-            ${{ github.workspace }}/pybind11/
-            ${{ github.workspace }}/install_KLU_Sundials/
-            # Headers and dynamic library files for SuiteSparse and SUNDIALS
-            ${{ env.HOME }}/.local/lib/
-            ${{ env.HOME }}/.local/include/
-            ${{ env.HOME }}/.local/examples/
-          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      # - name: Cache pybamm-requires nox environment for GNU/Linux
+      #   uses: actions/cache@v3
+      #   if: matrix.os == 'ubuntu-latest'
+      #   with:
+      #     path: |
+      #       # Repository files
+      #       ${{ github.workspace }}/pybind11/
+      #       ${{ github.workspace }}/install_KLU_Sundials/
+      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
+      #       ${{ env.HOME }}/.local/lib/
+      #       ${{ env.HOME }}/.local/include/
+      #       ${{ env.HOME }}/.local/examples/
+      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
@@ -327,18 +327,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      - name: Cache pybamm-requires nox environment for GNU/Linux
-        uses: actions/cache@v3
-        with:
-          path: |
-            # Repository files
-            ${{ github.workspace }}/pybind11/
-            ${{ github.workspace }}/install_KLU_Sundials/
-            # Headers and dynamic library files for SuiteSparse and SUNDIALS
-            ${{ env.HOME }}/.local/lib/
-            ${{ env.HOME }}/.local/include/
-            ${{ env.HOME }}/.local/examples/
-          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      # - name: Cache pybamm-requires nox environment for GNU/Linux
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       # Repository files
+      #       ${{ github.workspace }}/pybind11/
+      #       ${{ github.workspace }}/install_KLU_Sundials/
+      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
+      #       ${{ env.HOME }}/.local/lib/
+      #       ${{ env.HOME }}/.local/include/
+      #       ${{ env.HOME }}/.local/examples/
+      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires
@@ -382,18 +382,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      - name: Cache pybamm-requires nox environment for GNU/Linux
-        uses: actions/cache@v3
-        with:
-          path: |
-            # Repository files
-            ${{ github.workspace }}/pybind11/
-            ${{ github.workspace }}/install_KLU_Sundials/
-            # Headers and dynamic library files for SuiteSparse and SUNDIALS
-            ${{ env.HOME }}/.local/lib/
-            ${{ env.HOME }}/.local/include/
-            ${{ env.HOME }}/.local/examples/
-          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      # - name: Cache pybamm-requires nox environment for GNU/Linux
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       # Repository files
+      #       ${{ github.workspace }}/pybind11/
+      #       ${{ github.workspace }}/install_KLU_Sundials/
+      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
+      #       ${{ env.HOME }}/.local/lib/
+      #       ${{ env.HOME }}/.local/include/
+      #       ${{ env.HOME }}/.local/examples/
+      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires

From b25e3ee21533605bb76d01428b5599be2e373d20 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 17:26:09 +0530
Subject: [PATCH 18/21] Undo cache changes

This reverts commit 363c6f11d0cf01b503c92441e8e6dfc7eeb029e5.
---
 .github/workflows/test_on_push.yml | 124 ++++++++++++++---------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index eb366a024a..09a98b1131 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -91,19 +91,19 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      # - name: Cache pybamm-requires nox environment for GNU/Linux
-      #   uses: actions/cache@v3
-      #   if: matrix.os == 'ubuntu-latest'
-      #   with:
-      #     path: |
-      #       # Repository files
-      #       ${{ github.workspace }}/pybind11/
-      #       ${{ github.workspace }}/install_KLU_Sundials/
-      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
-      #       ${{ env.HOME }}/.local/lib/
-      #       ${{ env.HOME }}/.local/include/
-      #       ${{ env.HOME }}/.local/examples/
-      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      - name: Cache pybamm-requires nox environment for GNU/Linux
+        uses: actions/cache@v3
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          path: |
+            # Repository files
+            ${{ github.workspace }}/pybind11/
+            ${{ github.workspace }}/install_KLU_Sundials/
+            # Headers and dynamic library files for SuiteSparse and SUNDIALS
+            ${{ env.HOME }}/.local/lib/
+            ${{ env.HOME }}/.local/include/
+            ${{ env.HOME }}/.local/examples/
+          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
@@ -148,18 +148,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      # - name: Cache pybamm-requires nox environment for GNU/Linux
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       # Repository files
-      #       ${{ github.workspace }}/pybind11/
-      #       ${{ github.workspace }}/install_KLU_Sundials/
-      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
-      #       ${{ env.HOME }}/.local/lib/
-      #       ${{ env.HOME }}/.local/include/
-      #       ${{ env.HOME }}/.local/examples/
-      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      - name: Cache pybamm-requires nox environment for GNU/Linux
+        uses: actions/cache@v3
+        with:
+          path: |
+            # Repository files
+            ${{ github.workspace }}/pybind11/
+            ${{ github.workspace }}/install_KLU_Sundials/
+            # Headers and dynamic library files for SuiteSparse and SUNDIALS
+            ${{ env.HOME }}/.local/lib/
+            ${{ env.HOME }}/.local/include/
+            ${{ env.HOME }}/.local/examples/
+          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires
@@ -227,19 +227,19 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      # - name: Cache pybamm-requires nox environment for GNU/Linux
-      #   uses: actions/cache@v3
-      #   if: matrix.os == 'ubuntu-latest'
-      #   with:
-      #     path: |
-      #       # Repository files
-      #       ${{ github.workspace }}/pybind11/
-      #       ${{ github.workspace }}/install_KLU_Sundials/
-      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
-      #       ${{ env.HOME }}/.local/lib/
-      #       ${{ env.HOME }}/.local/include/
-      #       ${{ env.HOME }}/.local/examples/
-      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      - name: Cache pybamm-requires nox environment for GNU/Linux
+        uses: actions/cache@v3
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          path: |
+            # Repository files
+            ${{ github.workspace }}/pybind11/
+            ${{ github.workspace }}/install_KLU_Sundials/
+            # Headers and dynamic library files for SuiteSparse and SUNDIALS
+            ${{ env.HOME }}/.local/lib/
+            ${{ env.HOME }}/.local/include/
+            ${{ env.HOME }}/.local/examples/
+          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         if: matrix.os == 'ubuntu-latest'
@@ -327,18 +327,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      # - name: Cache pybamm-requires nox environment for GNU/Linux
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       # Repository files
-      #       ${{ github.workspace }}/pybind11/
-      #       ${{ github.workspace }}/install_KLU_Sundials/
-      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
-      #       ${{ env.HOME }}/.local/lib/
-      #       ${{ env.HOME }}/.local/include/
-      #       ${{ env.HOME }}/.local/examples/
-      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      - name: Cache pybamm-requires nox environment for GNU/Linux
+        uses: actions/cache@v3
+        with:
+          path: |
+            # Repository files
+            ${{ github.workspace }}/pybind11/
+            ${{ github.workspace }}/install_KLU_Sundials/
+            # Headers and dynamic library files for SuiteSparse and SUNDIALS
+            ${{ env.HOME }}/.local/lib/
+            ${{ env.HOME }}/.local/include/
+            ${{ env.HOME }}/.local/examples/
+          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires
@@ -382,18 +382,18 @@ jobs:
         run: |
           pip install --upgrade pip wheel setuptools nox
 
-      # - name: Cache pybamm-requires nox environment for GNU/Linux
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       # Repository files
-      #       ${{ github.workspace }}/pybind11/
-      #       ${{ github.workspace }}/install_KLU_Sundials/
-      #       # Headers and dynamic library files for SuiteSparse and SUNDIALS
-      #       ${{ env.HOME }}/.local/lib/
-      #       ${{ env.HOME }}/.local/include/
-      #       ${{ env.HOME }}/.local/examples/
-      #     key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
+      - name: Cache pybamm-requires nox environment for GNU/Linux
+        uses: actions/cache@v3
+        with:
+          path: |
+            # Repository files
+            ${{ github.workspace }}/pybind11/
+            ${{ github.workspace }}/install_KLU_Sundials/
+            # Headers and dynamic library files for SuiteSparse and SUNDIALS
+            ${{ env.HOME }}/.local/lib/
+            ${{ env.HOME }}/.local/include/
+            ${{ env.HOME }}/.local/examples/
+          key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
         run: python -m nox -s pybamm-requires

From 72773c43b60b27646db40469a4bca41eebc31a2b Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 17:26:44 +0530
Subject: [PATCH 19/21] Undo `pip` cache changes

This reverts commit f87b6bf5c8306581cdc4ed1e2f4fda3d61f077e4.
---
 .github/workflows/test_on_push.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 09a98b1131..f007b38e33 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -86,6 +86,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -143,6 +145,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -222,6 +226,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -280,6 +286,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -322,6 +330,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |
@@ -377,6 +387,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+          cache: 'pip'
+          cache-dependency-path: setup.py
 
       - name: Install standard Python dependencies
         run: |

From e63346983e4fbdf396c5f09b7ab0ac9cf1abe61a Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Thu, 16 Nov 2023 17:32:00 +0530
Subject: [PATCH 20/21] Re-introduce `xarray` and `pandas` lower bounds

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 26396805c8..f6dd93960f 100644
--- a/setup.py
+++ b/setup.py
@@ -206,7 +206,7 @@ def compile_KLU():
         "numpy>=1.24.4",
         "scipy>=1.10.1",
         "casadi>=3.6.3",
-        "xarray",
+        "xarray>=23.1.0",
         "anytree>=2.12.0",
     ],
     extras_require={
@@ -263,7 +263,7 @@ def compile_KLU():
             "nbmake",
         ],
         "pandas": [
-            "pandas",
+            "pandas>=2.0.3",
         ],
         "jax": [
             "jax==0.4.8",

From 0755c35b4a00975793b50aca5b76834604067ef5 Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Fri, 17 Nov 2023 14:10:12 +0530
Subject: [PATCH 21/21] Bump versions according to SPEC 0000

Co-Authored-By: Saransh Chopra <saransh0701@gmail.com>
---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index f6dd93960f..886378f44f 100644
--- a/setup.py
+++ b/setup.py
@@ -203,10 +203,10 @@ def compile_KLU():
     ],
     # List of dependencies
     install_requires=[
-        "numpy>=1.24.4",
-        "scipy>=1.10.1",
+        "numpy>=1.23.5",
+        "scipy>=1.9.3",
         "casadi>=3.6.3",
-        "xarray>=23.1.0",
+        "xarray>=2022.6.0",
         "anytree>=2.12.0",
     ],
     extras_require={
@@ -236,7 +236,7 @@ def compile_KLU():
             # on systems without an attached display, it should never be imported
             # outside of plot() methods.
             # Should not be imported
-            "matplotlib>=3.7.3",
+            "matplotlib>=3.6.0",
         ],
         "cite": [
             "pybtex>=0.24.0",
@@ -263,7 +263,7 @@ def compile_KLU():
             "nbmake",
         ],
         "pandas": [
-            "pandas>=2.0.3",
+            "pandas>=1.5.0",
         ],
         "jax": [
             "jax==0.4.8",