Update build_wheels_and_publish.yml

Author: katiebreivik

.github/workflows/build_wheels_and_publish.yml

@@ -14,7 +14,7 @@ env:
   CIBW_BUILD_VERBOSITY: "1"
 
 jobs:
-  build-wheels:
+  build-wheels-and-dist:
     name: Build ${{ matrix.python-version }} wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -30,50 +30,26 @@ jobs:
       with:
         python-version: "3.10"
 
-    - name: Setup Mac
-      if: runner.os == 'macOS'
+    - name: Install numpy
       run: |
+        python -m pip install --upgrade pip
         python -m pip install numpy h5py versioneer
         
-    - name: Setup Linux
-      if: runner.os == 'Linux'
-      run: |
-        python -m pip install numpy h5py versioneer
-        
-    - name: Build wheels
+    - name: Build source dist and wheels
       run: |
         sudo ln -s /opt/homebrew/bin/gfortran-11 /opt/homebrew/bin/gfortran || true
-        python -m pip install meson ninja build
+        python -m pip install setuptools wheel twine numpy build meson ninja
         pip install .
-        python -m build --wheel --outdir wheelhouse 
+        python -m build
     - uses: actions/upload-artifact@v3
       with:
-        path: ./wheelhouse/*.whl
-
-  build-source-dist:
-    name: Build source dist
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v4
-        name: Install Python
-        with:
-          python-version: "3.10" 
-          
-      - name: Build dist
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine numpy build meson ninja
-          pip install .
-          python -m build
-      - uses: actions/upload-artifact@v3
-        with:
-          path: ./dist/*.tar.gz
+        path: ./dist/*.tar.gz
+    - uses: actions/upload-artifact@v3
+      with:
+        path: ./dist/*.whl
 
   publish:
-    needs: [build-wheels, build-source-dist]
+    needs: [build-wheels-and-dist]
     name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
     runs-on: ${{ matrix.os }}
     strategy: