Whl (#24)

* prereq changes for build

* more update

* use correct script

* just do mac temporarily

* revert to all platforms

* see what happens with wheels

* tests only for linux

* don't do linux-x64 wheels yet

* add retries to redist downloads

* extend retry

Author: ibmmqmet

.github/workflows/release.yaml

@@ -61,7 +61,7 @@ jobs:
       matrix:
         buildplat:
         - [windows-2022, win_amd64, ""]
-        - [ubuntu-22.04, manylinux_x86_64, ""]
+        #- [ubuntu-22.04, manylinux_x86_64, ""]
         - [macos-14, macosx_arm64, ""]
 
         python: ["cp39"]
@@ -110,7 +110,7 @@ jobs:
           sudo mkdir -p /opt/mqm || true;
           sudo installer -verbose -pkg tmpPkg-temp.pkg -target /opt/mqm && rm -rf tmpPkg-temp.pkg && ln -s /opt/mqm $MQ_FILE_PATH;
           ;;
-          *) echo "Unrecognised platform";exit 1;;
+          *) echo "Unrecognised platform: $ImageOS";exit 1;;
           esac
 
       # The original version of this YAML file used this pattern to select the download image. Leaving it here for
@@ -128,7 +128,10 @@ jobs:
           # The default repair command tries to merge the MQ shared libraries into the wheel,
           # We do not want that as it would breach the Redist Client licensing rules if we
           # re-uploaded that wheel to PyPI. So we will just do a simple copy.
-          CIBW_REPAIR_WHEEL_COMMAND: cp {wheel} {dest_dir}
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: cp {wheel} {dest_dir}
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: cp {wheel} {dest_dir}
+          CIBW_REPAIR_WHEEL_COMMAND_LINUX: cp {wheel} {dest_dir}
+
 
         run: |
            python -m cibuildwheel --output-dir dist
@@ -162,7 +165,7 @@ jobs:
         run: |
           python -m build --sdist
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: artifact-sdist
           path: dist/*.tar.gz
@@ -175,7 +178,7 @@ jobs:
       # This permission is mandatory for trusted publishing, if we ever enable that
       id-token: write
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           pattern: artifact-*
           merge-multiple: true

CHANGELOG.md

@@ -19,6 +19,7 @@ Newest updates are at the top of this file.
 * Add more typing information to function definitions
 * Testcases don't use the deprecated form of objects/functions
 * PyPI release includes binary wheels for some platforms
+  * Not yet for Linux x64
 
 ## 2026 Apr 21 - V2.0.6
 * Better handling of message buffer sizes. Particularly for PCF operations (#21)

docs/Release.md

@@ -7,6 +7,10 @@ create the binary extension module.
 Even with binary wheels, you must install independently the MQ Client components. The wheels do not include the MQ
 product libraries.
 
+NOTE: For version 2.1.0, there is not a binary wheel supplied for Linux x64. Additional changes are required to
+the extension module to ensure the `manylinux` packaging works cleanly, and I didn't want to delay the rest of the
+release.
+
 The C extension module is fairly agnostic as to the version of Python it's running with. It conforms to the [Limited
 API](https://docs.python.org/3/c-api/stable.html#limited-c-api) at the Python 3.9 level. This ought to make it easier to
 redistribute applications within your own environment, compiling only once and copying the `.so` file to other
@@ -18,7 +22,7 @@ wheels, but not to automatically upload them to PyPI. This is to allow local che
 own workflows, including use of other PyPI-equivalent servers for testing of the images. The build is triggered manually
 with the gh `workflow_dispatch` operation. The workflow configuration file does have some automatic steps (for example
 to run on PR creation), but they are commented out. The Redistributable Client packages are used to build binary wheels
-for Linux/x64 and Windows; the MacOS Developer Toolkit is used to do the same for that platform.
+for Windows; the MacOS Developer Toolkit is used to do the same for that platform.
 
 The `runActions.sh` script controls the execution of the action, and the downloads of the sdist and wheel artifacts.
 

tools/getRedistributables.py

@@ -1,13 +1,14 @@
-# Download and extract the redistributable package to support building
-# the wheels on Windows and Linux.
+# Download and extract the MQ packages that support building
+# wheels on MacOS, Windows and Linux.
 #
 # Pass the source URL as the first argument and the destination directory
 # as the second argument.
 #
-# The source URL should end with .tar.gz or .zip
+# The source URL should end with .tar.gz (Linux) or .zip (Windows) or .pkg (MacOS)
 #
 import os
 import sys
+import time
 import tarfile
 import zipfile
 
@@ -18,12 +19,16 @@
     sys.exit(1)
 
 SOURCE_URL = sys.argv[1]
+# This is a directory
 DESTINATION_PATH = sys.argv[2]
 
+# And we actually download to a file whose name starts with the destination directory
 if SOURCE_URL.endswith('.tar.gz'):
     temp_path = DESTINATION_PATH + '-temp.tar.gz'
 elif SOURCE_URL.endswith('.zip'):
     temp_path = DESTINATION_PATH + '-temp.zip'
+elif SOURCE_URL.endswith('.pkg'):
+    temp_path = DESTINATION_PATH + '-temp.pkg'
 else:
     print("Unsupported archive format")
     sys.exit(1)
@@ -55,8 +60,27 @@ def extract_archive(archive_path, extract_to):
         raise ValueError("Unsupported archive format")
 
 
-print(f'Downloading "{SOURCE_URL}" to "{DESTINATION_PATH}"')
-download_file(SOURCE_URL, temp_path)
-extract_archive(temp_path, DESTINATION_PATH)
-os.unlink(temp_path)
+# If it's a .pkg file, that's for MacOS which we do not unpack here.
+# Instead, it'll be installed properly by the calling environment.
+print(f'Downloading "{SOURCE_URL}" to {temp_path}' )
+
+cnt = 0
+while True:
+    try:
+        # A very simple retry mechanism as we've seen occasional DNS failures
+        # on some github runners
+        download_file(SOURCE_URL, temp_path)
+        break
+    except requests.exceptions.ConnectionError as e:
+        if cnt == 3:
+            print("Maximum retries reached")
+            raise(e)
+        print(f"Connection error {e}: sleeping")
+        cnt = cnt + 1
+        time.sleep(5)
+
+if not SOURCE_URL.endswith('.pkg'):
+    print(f'Extracting files from {temp_path} to {DESTINATION_PATH}')
+    extract_archive(temp_path, DESTINATION_PATH)
+    os.unlink(temp_path)
 print(f'Done via "{temp_path}"')

tools/pyRelease.sh

@@ -263,7 +263,7 @@ fi
 export TWINE_USERNAME="__token__"
 export TWINE_PASSWORD="$tok"
 
-# verboseUpload="--verbose"
+verboseUpload="--verbose"
 
 # If using the local repository, then first make sure the pypi-server is running
 if $dryRun

tools/requirements-dev.txt

@@ -1,7 +1,9 @@
 #
 # Python packages required during the dev,test,release process.
 #
-requests==2.33.0
-abi3audit==0.0.22
+requests>=2.33.0
+abi3audit==0.0.26
 wheel==0.46.2
 build==1.3.0
+cibuildwheel==3.3.1
+

tools/runActions.sh

@@ -15,7 +15,7 @@ rc=0
 if [ -z "$NORUN" ]
 then
   # This runs against the default (main) branch. Add '--ref my-branch' if needed
-  gh workflow run release.yaml
+  gh workflow run release.yaml --ref whl
   rc=$?
   if [ $rc -eq 0  ]
   then