From f96be6ea49d532014aabc05dc9db5bbc59f38813 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Thu, 31 Oct 2024 11:53:59 +0000
Subject: [PATCH] Minor fixes

---
 .github/workflows/pyop2.yml | 13 ++-----------
 scripts/firedrake-install   |  5 ++++-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pyop2.yml b/.github/workflows/pyop2.yml
index d85288d8eb..38ae53fdef 100644
--- a/.github/workflows/pyop2.yml
+++ b/.github/workflows/pyop2.yml
@@ -72,22 +72,13 @@ jobs:
         run: |
           python -m pip install -U flake8
           python -m pip install -U pytest-timeout
+          python -m pip install -U setuptools
 
-      - name: Install PyOP2 (Python <3.12)
-        if: ${{ matrix.python-version != '3.12' }}
+      - name: Install PyOP2
         shell: bash
         working-directory: PyOP2
         run: python -m pip install .
 
-        # Not sure if this is a bug in setuptools or something PyOP2 is doing wrong
-      - name: Install PyOP2 (Python == 3.12)
-        if: ${{ matrix.python-version == '3.12' }}
-        shell: bash
-        working-directory: PyOP2
-        run: |
-          python -m pip install -U setuptools
-          python setup.py install
-
       - name: Run linting
         shell: bash
         working-directory: PyOP2
diff --git a/scripts/firedrake-install b/scripts/firedrake-install
index 00105d735d..85412eda35 100755
--- a/scripts/firedrake-install
+++ b/scripts/firedrake-install
@@ -1829,7 +1829,10 @@ if mode == "install":
         packages += [name]
 
     if args.honour_petsc_dir:
-        packages.remove("petsc")
+        try:
+            packages.remove("petsc")
+        except ValueError:
+            log.warning("PETSc wasn't in dependencies list")
 
     # Need to install petsc first in order to resolve hdf5 dependency.
     if not args.honour_petsc_dir: