flow sdist->wheel

Author: cvanelteren

.github/workflows/build.yml

@@ -43,13 +43,9 @@ jobs:
             packages/${{ matrix.package }}/dist/*.whl
           name: dist-${{ matrix.package }}
 
-  build_basemap:
-    name: Build basemap package (${{ matrix.os }})
-    needs: [build_data]
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, windows-2019, macos-13, macos-14]
-    runs-on: ${{ matrix.os }}
+  build_sdist:
+    name: Build basemap sdist
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
@@ -59,13 +55,83 @@ jobs:
           python-version: "3.9"
 
       - name: Build sdist
-        if: matrix.os == 'ubuntu-22.04'
         run: |
           cd packages/basemap
           python -m pip install build
           python -m build --sdist
 
-      - name: Build wheels
+      - uses: actions/upload-artifact@v4
+        with:
+          path: packages/basemap/dist/*.tar.gz
+          name: basemap-sdist
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    needs: [build_data, build_sdist]
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, windows-2019, macos-13, macos-14]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Download basemap sdist
+        uses: actions/download-artifact@v4
+        with:
+          name: basemap-sdist
+          path: ./sdist/
+
+      - name: Extract sdist (Linux/macOS)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          # Create extraction directory in the workspace
+          mkdir -p ./sdist_extract
+
+          # Extract using tar (Unix-style)
+          tar -xvf ./sdist/*.tar.gz -C ./sdist_extract
+
+          # Get the extracted directory name
+          EXTRACTED_DIR=$(ls -d ./sdist_extract/*/ | head -1)
+          echo "SDIST_DIR=$(pwd)/${EXTRACTED_DIR}" >> $GITHUB_ENV
+
+          # Verify contents
+          ls -la ${EXTRACTED_DIR}
+
+      - name: Extract sdist (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          # Create extraction directory
+          New-Item -ItemType Directory -Force -Path "sdist_extract"
+
+          # Find the tarball file (without using wildcards)
+          $tarball = Get-ChildItem -Path "sdist" -Filter "*.tar.gz" | Select-Object -First 1
+
+          # Debug - show what we found
+          Write-Host "Found tarball: $($tarball.FullName)"
+
+          # Extract using the specific file path (not wildcard)
+          tar -xvf $tarball.FullName -C "sdist_extract"
+
+          # Get the extracted directory name
+          $extractedDir = (Get-ChildItem -Path "sdist_extract" -Directory | Select-Object -First 1).FullName
+
+          # Debug - show what we found
+          Write-Host "Extracted directory: $extractedDir"
+
+          # Set the environment variable
+          echo "SDIST_DIR=$extractedDir" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+          # Verify contents
+          Get-ChildItem $extractedDir
+
+      - name: Build wheels from sdist
         uses: pypa/cibuildwheel@v2.22.0
         env:
           CIBW_ARCHS: "native"
@@ -82,22 +148,18 @@ jobs:
             PIP_PREFER_BINARY=1
             PYTHONUNBUFFERED=1
             LD_LIBRARY_PATH="${GEOS_DIR}/lib"
-          # LD_LIBRARY_PATH in environment is needed by
-          # auditwheel (Linux) and delocate (MacOS).
         with:
-          package-dir: "packages/basemap"
-          output-dir: "packages/basemap/dist"
+          package-dir: ${{ env.SDIST_DIR }} # Use extracted sdist
+          output-dir: "dist"
 
       - uses: actions/upload-artifact@v4
         with:
-          path: |
-            packages/basemap/dist/*.tar.gz
-            packages/basemap/dist/*.whl
-          name: dist-basemap-${{ matrix.os }}
+          path: dist/*.whl
+          name: dist-basemap-wheels-${{ matrix.os }}
 
   check:
     name: Check packages
-    needs: [build_data, build_basemap]
+    needs: [build_data, build_sdist, build_wheels]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/download-artifact@v4
@@ -106,6 +168,11 @@ jobs:
           pattern: "dist-*"
           merge-multiple: true
 
+      - uses: actions/download-artifact@v4
+        with:
+          path: dist
+          name: basemap-sdist
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -117,9 +184,20 @@ jobs:
           python -m twine check dist/*.tar.gz
           python -m twine check dist/*.whl
 
+      # Verification step to ensure sdist is complete
+      - name: Verify sdist can build wheel
+        run: |
+          python -m pip install build setuptools wheel
+          mkdir -p /tmp/sdist_test
+          tar -xvf dist/*.tar.gz -C /tmp/sdist_test
+          cd /tmp/sdist_test/*/
+          python -m pip install -e .
+          python -m build --wheel
+          ls -la dist/*.whl
+
   upload:
     name: Upload packages
-    needs: [build_data, build_basemap, check]
+    needs: [build_data, build_sdist, build_wheels, check]
     runs-on: ubuntu-22.04
     environment: PyPI
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
@@ -130,6 +208,11 @@ jobs:
           pattern: "dist-*"
           merge-multiple: true
 
+      - uses: actions/download-artifact@v4
+        with:
+          path: dist
+          name: basemap-sdist
+
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with: