rename wheels

MacPython · Sep 13, 2023 · 7181789 · 7181789
1 parent bab3887
commit 7181789
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -120,11 +120,12 @@ jobs:
 
     - uses: actions/upload-artifact@v3
       with:
+        name: openblas
         path: libs/openblas*.tar.gz
 
     - uses: actions/upload-artifact@v3
-      if: matrix.plat == 'i686' || matrix.INTERFACE64 == '1'
       with:
+        name: wheels
         path: dist/scipy_openblas*.whl
 
     - name: Upload

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -41,11 +41,13 @@ jobs:
         # https://sourceforge.net/p/msys2/discussion/general/thread/b7dfdac8/#3939
         if ( "${{ matrix.plat }}" -eq "x86") {
           echo "PLAT=i686" >> $env:GITHUB_ENV
+          echo "WHEEL_PLAT=win32" >> $env:GITHUB_ENV
           echo "MSYSTEM=MINGW32" >> $env:GITHUB_ENV
           echo "LDFLAGS=-static -static-libgcc" >> $env:GITHUB_ENV
           echo "BUILD_BITS=32" >> $env:GITHUB_ENV
         } else {
           echo "PLAT=x86_64" >> $env:GITHUB_ENV
+          echo "WHEEL_PLAT=x86_64" >> $env:GITHUB_ENV
           echo "MSYSTEM=UCRT64" >> $env:GITHUB_ENV
           echo "LDFLAGS=-lucrt -static -static-libgcc" >> $env:GITHUB_ENV
           echo "BUILD_BITS=64" >> $env:GITHUB_ENV
@@ -108,8 +110,10 @@ jobs:
             sed -e "s/openblas_get_config64_/openblas_get_config/" -i local/scipy_openblas32/__init__.py
             sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__main__.py
         fi
-            
+
         python -m pip wheel -w dist -vv .
+        # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
+        for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done
 
     - name: Set up different Python
       uses: actions/setup-python@v4
@@ -119,10 +123,12 @@ jobs:
 
     - uses: actions/upload-artifact@v3
       with:
+        name: openblas
         path: builds/openblas*.zip
 
     - uses: actions/upload-artifact@v3
       with:
+        name: wheels
         path: dist/scipy_openblas*.whl
 
     - name: Test 64-bit interface wheel

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scipy_openblas64"
-version = "0.3.23"
+version = "0.3.23.293"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

diff --git a/travis-ci/build_wheel.sh b/travis-ci/build_wheel.sh
@@ -50,9 +50,12 @@ python3.7 -m pip wheel -w dist -vv .
 
 if [ $(uname) == "Darwin" ]; then
     python3.7 -m pip install delocate
-    delocate-wheel dist/*.whl
+    # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
+    for f in dist/*.whl; do mv $f "${f/%any.whl/macosx_10_9_$PLAT.whl}"; done
+    delocate-wheel -v dist/*.whl
 else
     auditwheel repair -w dist dist/*.whl
+    rm dist/scipy_openblas*-none-any.whl
 fi
 
 if [ "${PLAT}" == "arm64" ]; then