[GR-59373] Merge GraalPy public and internal wheelbuilder.

PullRequest: graalpython/3539

Author: timfel

.github/workflows/build-act-wheels.yml

@@ -2,141 +2,34 @@ name: build-windows-amd64-wheels
 'on':
   workflow_dispatch:
     inputs:
-      name:
+      packages:
         type: string
-        description: Pkg to build (empty for all)
+        description: Pkgs to build (comma-separated, empty for all)
         required: false
-      graalpy:
+      graalpy_url:
         type: string
-        description: GraalPy download url prefix (empty for default)
-        required: false
+        description: GraalPy download url
+        required: true
 jobs:
-  numpy-windows-amd64:
+  build_wheels:
     runs-on: windows-latest
-    if: ${{ !cancelled() && (inputs.name == '' || inputs.name == 'numpy') }}
+    env:
+      PACKAGES_TO_BUILD: ${{ inputs.packages }}
     steps:
       - uses: ilammy/msvc-dev-cmd@v1
-      - name: Install dependencies
-        run: |
-          Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
-          Expand-Archive patch.zip -DestinationPath ../patch -Force
       - name: Checkout
         uses: actions/checkout@main
-      - name: Setup custom GraalPy
-        if: inputs.graalpy != ''
-        run: |-
-          $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest ${{ inputs.graalpy }}-windows-amd64.zip -OutFile graalpy-windows-amd64.zip
-          Expand-Archive graalpy-windows-amd64.zip
-          mv graalpy-windows-amd64/* graalpy
-          graalpy/bin/graalpy.exe -s -m ensurepip
-          graalpy/bin/graalpy.exe -m pip install wheel
-      - name: Setup GraalPy
+      - name: Setup Python
         uses: actions/setup-python@v5
-        if: inputs.graalpy == ''
         with:
-          python-version: graalpy24.1
-      - name: Setup local GraalPy venv
-        if: inputs.graalpy == ''
-        run: python -m venv graalpy
-      - name: Build wheel
-        run: |-
-          $env:PIP_FIND_LINKS=$PWD
-          $env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
-          graalpy/bin/graalpy -m pip wheel --find-links $PWD numpy
-      - name: Store wheels
-        uses: actions/upload-artifact@main
-        with:
-          name: numpy-windows-amd64
-          path: numpy*.whl
-          if-no-files-found: error
-  PyYAML-windows-amd64:
-    runs-on: windows-latest
-    needs: numpy-windows-amd64
-    if: ${{ !cancelled() && (inputs.name == '' || inputs.name == 'PyYAML') }}
-    steps:
-      - uses: ilammy/msvc-dev-cmd@v1
-      - name: Install dependencies
+          python-version: 3.12
+      - name: Build wheels
         run: |
-          Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
-          Expand-Archive patch.zip -DestinationPath ../patch -Force
-      - name: Checkout
-        uses: actions/checkout@main
-      - name: Setup custom GraalPy
-        if: inputs.graalpy != ''
-        run: |-
-          $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest ${{ inputs.graalpy }}-windows-amd64.zip -OutFile graalpy-windows-amd64.zip
-          Expand-Archive graalpy-windows-amd64.zip
-          mv graalpy-windows-amd64/* graalpy
-          graalpy/bin/graalpy.exe -s -m ensurepip
-          graalpy/bin/graalpy.exe -m pip install wheel
-      - name: Setup GraalPy
-        uses: actions/setup-python@v5
-        if: inputs.graalpy == ''
-        with:
-          python-version: graalpy24.1
-      - name: Setup local GraalPy venv
-        if: inputs.graalpy == ''
-        run: python -m venv graalpy
-      - name: Download artifacts from numpy
-        uses: actions/download-artifact@main
-        continue-on-error: true
-        with:
-          name: numpy-windows-amd64
-      - name: Build wheel
-        run: |-
-          $env:PIP_FIND_LINKS=$PWD
-          $env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
-          graalpy/bin/graalpy -m pip wheel --find-links $PWD PyYAML
-      - name: Store wheels
-        uses: actions/upload-artifact@main
-        with:
-          name: PyYAML-windows-amd64
-          path: PyYAML*.whl
-          if-no-files-found: error
-  ujson-windows-amd64:
-    runs-on: windows-latest
-    needs: PyYAML-windows-amd64
-    if: ${{ !cancelled() && (inputs.name == '' || inputs.name == 'ujson') }}
-    steps:
-      - uses: ilammy/msvc-dev-cmd@v1
-      - name: Install dependencies
-        run: |
-          Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
-          Expand-Archive patch.zip -DestinationPath ../patch -Force
-      - name: Checkout
-        uses: actions/checkout@main
-      - name: Setup custom GraalPy
-        if: inputs.graalpy != ''
-        run: |-
-          $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest ${{ inputs.graalpy }}-windows-amd64.zip -OutFile graalpy-windows-amd64.zip
-          Expand-Archive graalpy-windows-amd64.zip
-          mv graalpy-windows-amd64/* graalpy
-          graalpy/bin/graalpy.exe -s -m ensurepip
-          graalpy/bin/graalpy.exe -m pip install wheel
-      - name: Setup GraalPy
-        uses: actions/setup-python@v5
-        if: inputs.graalpy == ''
-        with:
-          python-version: graalpy24.1
-      - name: Setup local GraalPy venv
-        if: inputs.graalpy == ''
-        run: python -m venv graalpy
-      - name: Download artifacts from PyYAML
-        uses: actions/download-artifact@main
-        continue-on-error: true
-        with:
-          name: PyYAML-windows-amd64
-      - name: Build wheel
-        run: |-
-          $env:PIP_FIND_LINKS=$PWD
-          $env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
-          graalpy/bin/graalpy -m pip wheel --find-links $PWD ujson
+          $env:PATH+=";C:\Program Files\Git\usr\bin"
+          python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
         uses: actions/upload-artifact@main
         with:
-          name: ujson-windows-amd64
-          path: ujson*.whl
+          name: wheels
+          path: wheelhouse/*.whl
           if-no-files-found: error

.github/workflows/build-linux-aarch64-wheels.yml

@@ -13,6 +13,7 @@ language runtime. The main focus is on user-observable behavior of the engine.
   * This means all Python methods of these types are available on the corresponding foreign objects, which behave as close as possible as if they were Python objects.
   * See [the documentation](https://github.com/oracle/graalpython/blob/master/docs/user/Interoperability.md#interacting-with-foreign-objects-from-python-scripts) for more information.
 * Remove support for running with Sulong managed both in embeddings as well as through the `graalpy-managed` launcher.
+* Rewrite wheelbuilder to be easier to use and contribute to. This version is now the same we run internally to build publishable wheels for some platforms we support, so the community can build the same wheels on their own hardware easily if desired.
 
 ## Version 24.1.0
 * GraalPy is now considered stable for pure Python workloads. While many workloads involving native extension modules work, we continue to consider them experimental. You can use the command-line option `--python.WarnExperimentalFeatures` to enable warnings for such modules at runtime. In Java embeddings the warnings are enabled by default and you can suppress them by setting the context option 'python.WarnExperimentalFeatures' to 'false'.

.github/workflows/build-linux-amd64-wheels.yml

@@ -1 +1 @@
-{ "overlay": "947e97f768b6e4a5868c3afa76617c2b2f72ff33" }
+{ "overlay": "a53f75105e24ff44381970de172a8462fa45b9a7" }

.github/workflows/build-macos-aarch64-wheels.yml

@@ -59,6 +59,7 @@
 import org.graalvm.shadowed.com.ibm.icu.impl.Punycode;
 import org.graalvm.shadowed.com.ibm.icu.text.StringPrepParseException;
 
+import com.oracle.graal.python.builtins.PythonOS;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ApiInitException;
@@ -309,7 +310,10 @@ public static Object loadCExtModule(Node location, PythonContext context, Module
                 String message = "Loading C extension module %s from '%s'. Support for the Python C API is considered experimental.";
                 if (!runViaLauncher) {
                     message += " See https://www.graalvm.org/latest/reference-manual/python/Native-Extensions/#embedding-limitations for the limitations. " +
-                                    "You can suppress this warning by setting the context option 'python.WarnExperimentalFeatures' to 'false'";
+                                    "You can suppress this warning by setting the context option 'python.WarnExperimentalFeatures' to 'false'.";
+                }
+                if (PythonOS.getPythonOS() == PythonOS.PLATFORM_WIN32) {
+                    message += " If loading binary wheels fails, please make sure you installed the latest Microsoft Visual C++ Redistributable from https://aka.ms/vs/17/release/vc_redist.x64.exe.";
                 }
                 getLogger().warning(message.formatted(spec.name, spec.path));
             }