From 44ce67e63baea5c08cf9c7b0e0ff1e815123b29d Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Sun, 17 Dec 2023 01:23:23 +0530
Subject: [PATCH] Revert "#3480 Install `CMake` alongside `nox` and skip
 `pybamm-requires`"

This reverts commit 2da613de026b78e3d7fd8d93441ca23646a8dce0.
---
 .github/workflows/test_on_push.yml | 36 ++++++++++++------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index e8d5f9cc37..bad8692ace 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -91,11 +91,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
 
-      - name: Install nox and CMake
-        run: python -m pip install nox cmake
+      - name: Install nox
+        run: python -m pip install nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux and macOS
-        id: pybamm-requires
         uses: actions/cache@v3
         if: matrix.os != 'windows-latest'
         with:
@@ -109,7 +108,7 @@ jobs:
           key: nox-${{ matrix.os }}-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py', '**/noxfile.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux and macOS
-        if: matrix.os != 'windows-latest' && steps.pybamm-requires.outputs.cache-hit != 'true'
+        if: matrix.os != 'windows-latest'
         run: python -m nox -s pybamm-requires
 
       - name: Run unit tests for ${{ matrix.os }} with Python ${{ matrix.python-version }}
@@ -148,11 +147,10 @@ jobs:
           python-version: 3.11
           cache: 'pip'
 
-      - name: Install nox and CMake
-        run: python -m pip install nox cmake
+      - name: Install nox
+        run: python -m pip install nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
-        id: pybamm-requires
         uses: actions/cache@v3
         with:
           path: |
@@ -165,7 +163,6 @@ jobs:
           key: nox-${{ matrix.os }}-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py', '**/noxfile.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        if: steps.pybamm-requires.outputs.cache-hit != 'true'
         run: python -m nox -s pybamm-requires
 
       - name: Run unit tests for Ubuntu with Python 3.11 and generate coverage report
@@ -230,11 +227,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
 
-      - name: Install nox and CMake
-        run: python -m pip install nox cmake
+      - name: Install nox
+        run: python -m pip install nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux and macOS
-        id: pybamm-requires
         uses: actions/cache@v3
         if: matrix.os != 'windows-latest'
         with:
@@ -248,7 +244,7 @@ jobs:
           key: nox-${{ matrix.os }}-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py', '**/noxfile.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux and macOS
-        if: matrix.os != 'windows-latest' && steps.pybamm-requires.outputs.cache-hit != 'true'
+        if: matrix.os != 'windows-latest'
         run: python -m nox -s pybamm-requires
 
       - name: Run integration tests for ${{ matrix.os }} with Python ${{ matrix.python-version }}
@@ -275,11 +271,11 @@ jobs:
           execute_install_scripts: true
 
       # dot -c is for registering graphviz fonts and plugins
-      - name: Install TeXLive for Linux
+      - name: Install OpenBLAS and TeXLive for Linux
         run: |
           sudo apt-get update
           sudo dot -c
-          sudo apt-get install texlive-latex-extra dvipng
+          sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
       - name: Set up Python 3.11
         id: setup-python
@@ -330,11 +326,10 @@ jobs:
           python-version: 3.11
           cache: 'pip'
 
-      - name: Install nox and CMake
-        run: python -m pip install nox cmake
+      - name: Install nox
+        run: python -m pip install nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
-        id: pybamm-requires
         uses: actions/cache@v3
         with:
           path: |
@@ -347,7 +342,6 @@ jobs:
           key: nox-${{ matrix.os }}-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py', '**/noxfile.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        if: steps.pybamm-requires.outputs.cache-hit != 'true'
         run: python -m nox -s pybamm-requires
 
       - name: Run example notebooks tests for GNU/Linux with Python 3.11
@@ -386,11 +380,10 @@ jobs:
           python-version: 3.11
           cache: 'pip'
 
-      - name: Install nox and CMake
-        run: python -m pip install nox cmake
+      - name: Install nox
+        run: python -m pip install nox
 
       - name: Cache pybamm-requires nox environment for GNU/Linux
-        id: pybamm-requires
         uses: actions/cache@v3
         with:
           path: |
@@ -403,7 +396,6 @@ jobs:
           key: nox-${{ matrix.os }}-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py', '**/noxfile.py') }}
 
       - name: Install SuiteSparse and SUNDIALS on GNU/Linux
-        if: steps.pybamm-requires.outputs.cache-hit != 'true'
         run: python -m nox -s pybamm-requires
 
       - name: Run example scripts tests for GNU/Linux with Python 3.11