Fix failing workflows: remove deprecated macos-12 runners, pkg-config…

… installation, and use python -m pip
qpv-research-group · Nov 21, 2024 · 32311b3 · 32311b3
1 parent 1a89693
commit 32311b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_deploy_wheels.yml b/.github/workflows/build_deploy_wheels.yml
@@ -25,7 +25,7 @@ jobs:
           # so easier to separate out here.
           - [ ubuntu-latest, manylinux, x86_64]
           - [ ubuntu-latest, manylinux, i686]
-          - [ macos-12, macosx, x86_64 ] # Intel chip
+          - [ macos-13, macosx, x86_64 ] # Intel chip
           - [ macos-latest, macosx, arm64] # ARM M1/M2 chip
           - [ windows-latest, win, AMD64]
 

diff --git a/.github/workflows/test_unit_and_examples.yml b/.github/workflows/test_unit_and_examples.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-         os: [ubuntu-latest, macos-12, windows-latest, macos-latest]
+         os: [ubuntu-latest, macos-13, windows-latest, macos-latest]
          python-version: ["3.9", "3.10", "3.11", "3.12"]
          exclude:
            - os: macos-14
@@ -49,11 +49,11 @@ jobs:
       - name: Install system dependencies in MacOS (ARM)
         if: matrix.os == 'macos-latest'
         run: |
-           brew reinstall gfortran openblas pkg-config 
+           brew reinstall gfortran openblas
            brew install ngspice boost suite-sparse
 
       - name: Install system dependencies in MacOS (Intel)
-        if: matrix.os == 'macos-12'
+        if: matrix.os == 'macos-13'
         run: |
            brew reinstall gfortran
            brew install ngspice 
@@ -64,7 +64,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          pip install --upgrade pip uv
+          python -m pip install --upgrade pip uv
           
           uv pip install --system numpy --config-settings=setup-args="-Dallow-noblas=true"
           uv pip install --system pytest meson-python ninja cython spin==0.9
@@ -149,7 +149,7 @@ jobs:
       - name: Install system dependencies in MacOS (ARM)
         if: matrix.os == 'macos-latest'
         run: |
-           brew reinstall gfortran openblas pkg-config 
+           brew reinstall gfortran openblas
            brew install ngspice boost suite-sparse
 
       - name: Install Python dependecies