Split wheel install

rjfarmer · Jan 29, 2024 · 06fd1c6 · 06fd1c6
1 parent 2064f2b
commit 06fd1c6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
@@ -44,7 +44,8 @@ jobs:
           shell: "C:\\tools\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"
           run: |
             /usr/bin/python3.9 -m pip install --upgrade pip
-            /usr/bin/python3.9 -m pip install build wheel pytest dataclasses_json cpyparsing platformdirs importlib_metadata
+            /usr/bin/python3.9 -m pip install build wheel 
+            /usr/bin/python3.9 -m pip install pytest dataclasses_json cpyparsing platformdirs importlib_metadata
         - name: Install 
           shell: "C:\\tools\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"
           run: |

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -21,7 +21,7 @@ jobs:
       run: |
         sudo apt-get install gfortran-12
         python -m pip install --upgrade pip
-        python3 -m pip install build wheel pytest
+        python -m pip install build wheel pytest
     - name: Build a binary wheel and a source tarball
       run: >-
         python3 -m

diff --git a/.github/workflows/pypy.yml b/.github/workflows/pypy.yml
@@ -20,8 +20,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install build wheel pytest numpy platformdirs cpyparsing
+          pyp3 -m pip install --upgrade pip
+          pyp3 -m pip install build wheel 
+          pyp3 -m pip install pytest numpy platformdirs cpyparsing
 
       - uses: fortran-lang/setup-fortran@v1
         id: setup-fortran

diff --git a/.github/workflows/qemu.yml b/.github/workflows/qemu.yml
@@ -71,7 +71,8 @@ jobs:
           apt-get update &&
           apt-get install -y cmake git python3 python-is-python3 python3-dev python3-venv python3-pip python3-numpy automake libc6-dev linux-libc-dev gcc gfortran &&
           git config --global --add safe.directory /gfort2py &&
-          python -m pip install --upgrade build wheel pytest dataclasses_json cpyparsing platformdirs importlib_metadata
+          python -m pip install --upgrade build wheel &&
+          python -m pip install --upgrade pytest dataclasses_json cpyparsing platformdirs importlib_metadata
         "
         docker commit ${TOOLCHAIN_NAME} ${TOOLCHAIN_NAME}
         docker save -o ~/docker_${TOOLCHAIN_NAME}.tar ${TOOLCHAIN_NAME}