Minor fixes

firedrakeproject · Oct 31, 2024 · f96be6e · f96be6e
1 parent 47cc33a
commit f96be6e
Show file tree

Hide file tree

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