CI: update cibuildwheel jobs for change to Meson

[build wheel]

Author: rgommers

.github/workflows/wheel_tests_and_release.yml

@@ -94,8 +94,6 @@ jobs:
         os: [macos-latest]
         cibw_python: [ "cp38-*", "cp39-*", "cp310-*" , "cp311-*" ]
         cibw_arch: [ "x86_64", "arm64"]
-    env:
-      MACOSX_DEPLOYMENT_TARGET: "10.13"
     steps:
       - uses: actions/checkout@v3
         with:
@@ -109,20 +107,25 @@ jobs:
       - name: Install cibuildwheel
         run: |
           python -m pip install cibuildwheel
+
       - name: Build wheels for CPython (MacOS)
         run: |
+          # We need to set both MACOS_DEPLOYMENT_TARGET and MACOSX_DEPLOYMENT_TARGET
+          # until there is a new release with this commit:
+          # https://github.com/mesonbuild/meson-python/pull/309 (should be in 0.13.0)
+          if [[ "$CIBW_ARCHS_MACOS" == arm64 ]]; then
+              export MACOSX_DEPLOYMENT_TARGET=11.0
+              export MACOS_DEPLOYMENT_TARGET=11.0
+          else
+              export MACOSX_DEPLOYMENT_TARGET=10.13
+              export MACOS_DEPLOYMENT_TARGET=10.13
+          fi
+          echo MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: ${{ matrix.cibw_python }}
           CIBW_ARCHS_MACOS: ${{ matrix.cibw_arch }}
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CC: /usr/bin/clang
-          CXX: /usr/bin/clang++
-          # CPPFLAGS: "-Xpreprocessor -fopenmp"
-          # CFLAGS: "-Wno-implicit-function-declaration -I/usr/local/opt/libomp/include"
-          # CXXFLAGS: "-I/usr/local/opt/libomp/include"
-          # LDFLAGS: "-Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp"
 
       - uses: actions/upload-artifact@v3
         with:
@@ -138,10 +141,6 @@ jobs:
         os: [windows-latest]
         cibw_arch: ["AMD64", "x86"]
         cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
-        # exclude:
-        #   - os: windows-latest
-        #     cibw_python: "cp310-*"
-        #     cibw_arch: x86
     steps:
       - uses: actions/checkout@v3
         with:
@@ -155,14 +154,51 @@ jobs:
       - name: Install cibuildwheel
         run: |
           python -m pip install cibuildwheel
-      - name: Build Windows wheels for CPython
+
+      - name: Build x86-64 (64-bit) Windows wheels for CPython
+        if: matrix.cibw_arch == 'AMD64'
+        # From https://github.com/actions/virtual-environments/issues/294#issuecomment-588090582,
+        # with additional -arch=amd64 flag to vsdevcmd.bat. Fix synced from scikit-image.
         run: |
+          function Invoke-VSDevEnvironment {
+            $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+              $installationPath = & $vswhere -prerelease -legacy -latest -property installationPath
+              $Command = Join-Path $installationPath "Common7\Tools\vsdevcmd.bat"
+            & "${env:COMSPEC}" /s /c "`"$Command`" -arch=amd64 -no_logo && set" | Foreach-Object {
+                  if ($_ -match '^([^=]+)=(.*)') {
+                      [System.Environment]::SetEnvironmentVariable($matches[1], $matches[2])
+                  }
+              }
+          }
+          Invoke-VSDevEnvironment
+          Get-Command rc.exe | Format-Table -AutoSize
+
+          python -m cibuildwheel --output-dir dist
+        env:
+          CIBW_BUILD: ${{ matrix.cibw_python }}
+          CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_arch }}
+
+      - name: Build x86 (32-bit) Windows wheels for CPython
+        if: matrix.cibw_arch == 'x86'
+        # Same as above, but without `-arch=amd64` target arch selection argument
+        run: |
+          function Invoke-VSDevEnvironment {
+            $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+              $installationPath = & $vswhere -prerelease -legacy -latest -property installationPath
+              $Command = Join-Path $installationPath "Common7\Tools\vsdevcmd.bat"
+            & "${env:COMSPEC}" /s /c "`"$Command`" -no_logo && set" | Foreach-Object {
+                  if ($_ -match '^([^=]+)=(.*)') {
+                      [System.Environment]::SetEnvironmentVariable($matches[1], $matches[2])
+                  }
+              }
+          }
+          Invoke-VSDevEnvironment
+          Get-Command rc.exe | Format-Table -AutoSize
+
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: ${{ matrix.cibw_python }}
           CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_arch }}
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
 
       - uses: actions/upload-artifact@v3
         with:
@@ -198,12 +234,12 @@ jobs:
       - name: Publish the source distribution on PyPI
         run: |
           PYWT_VERSION=$(git describe --tags)
-          python setup.py sdist
+          python -m build --sdist
           ls -la ${{ github.workspace }}/dist
           # We prefer to release wheels before source because otherwise there is a
           # small window during which users who pip install pywt will require compilation.
           twine upload ${{ github.workspace }}/dist/*.whl
-          twine upload ${{ github.workspace }}/dist/PyWavelets-${PYWT_VERSION:1}.tar.gz
+          twine upload ${{ github.workspace }}/dist/pywavelets-${PYWT_VERSION:1}.tar.gz
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TWINE_TOKEN }}