Okay, that should work

qmlcode · Jan 13, 2025 · 3809839 · 3809839
1 parent 46975fe
commit 3809839
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/test.macos.yml b/.github/workflows/test.macos.yml
@@ -16,21 +16,22 @@ jobs:
     strategy:
       matrix:
         os: ['macos-latest']
-        python-version: ['3.11','3.12']
+        python-version: ['3.11', '3.12']
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+
       - run: which brew
       - run: brew install gcc openblas lapack libomp
       - run: ls /opt/homebrew/bin/
       - run: which gfortran-14
 
-      # TODO Setup uv
-
-      - run: pip install -r ./requirements.txt
+      - run: FC=gfortran-14 make env_uv python_version=${{ matrix.python-version }}
 
-      - run: FC=gfortran-14 pip install . -v
-      - run: make test python=python
-      - run: make format python=python
-      - run: FC=gfortran-14 make build python=python
-      - run: make test-dist python=python
+      - run: make test
+      - run: make format
+      - run: FC=gfortran-14 make build
+      - run: make test-dist
diff --git a/.github/workflows/test.ubuntu.yml b/.github/workflows/test.ubuntu.yml
@@ -16,26 +16,19 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.11','3.12']
+        python-version: ['3.11', '3.12']
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v5
 
-      # - uses: conda-incubator/setup-miniconda@v2
-      #   with:
-      #     activate-environment: dev
-      #     environment-file: ./environment.yaml
-      #     python-version: ${{ matrix.python-version }}
-
       - run: sudo apt-get install -y gcc libomp-dev libopenblas-dev
 
       - run: make env_uv python_version=${{ matrix.python-version }}
 
-      # - run: pip install . -v
       - run: make test
-      - run: make format python=python
-      - run: make build python=python
-      - run: make test-dist python=python
+      - run: make format
+      - run: make build
+      - run: make test-dist