Build Python 3.10 wheels (update cibuildwheel to 2.7.0) (confluentinc#1372)

edenhill · web-flow · commit 6387a09710e1 · 2022-06-21T14:33:19.000+02:00
diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat
@@ -13,7 +13,7 @@ set WHEELHOUSE=%4
 if [%WHEELHOUSE%]==[] goto usage
 echo on
 
-set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH%
+set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH%
 set CIBW_BEFORE_BUILD=python -m pip install delvewheel==0.0.6
 set CIBW_TEST_REQUIRES=-r tests/requirements.txt
 set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py
@@ -25,7 +25,7 @@ set CIBW_REPAIR_WHEEL_COMMAND=python -m delvewheel repair --add-path %DLL_DIR% -
 
 set PATH=%PATH%;c:\Program Files\Git\bin\
 
-python -m pip install cibuildwheel==1.11.0 || goto :error
+python -m pip install cibuildwheel==2.7.0 || goto :error
 
 python -m cibuildwheel --output-dir %WHEELHOUSE% --platform windows || goto :error
 
diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh
@@ -7,8 +7,8 @@
 this_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 
-# Skip PyPy, Python2, old Python3 versions, and x86 builds.
-export CIBW_SKIP="pp* cp27-* cp35-* *i686"
+# Skip PyPy, Python2, old Python3 versions, musl, and x86 builds.
+export CIBW_SKIP="pp* cp27-* cp35-* *i686 *musllinux*"
 # Run a simple test suite
 export CIBW_TEST_REQUIRES="-r tests/requirements.txt"
 export CIBW_TEST_COMMAND="pytest {project}/tests/test_Producer.py"
@@ -51,7 +51,7 @@ esac
 
 $this_dir/install-librdkafka.sh $librdkafka_version dest
 
-install_pkgs=cibuildwheel==1.11.0
+install_pkgs=cibuildwheel==2.7.0
 
 python3 -m pip install $install_pkgs ||
     pip3 install $install_pkgs
