Rebuild the package with wheel instead of zip for correct signatures. (confluentinc#896)

anikifoss · edenhill · web-flow · commit dc2033a770ce · 2020-07-09T12:54:17.000+02:00
* Rebuild the package with wheel instead of zip for correct signatures.

* Moved wheel rebuilding script into a .py file.

* Invoke wheel from command line instead of a py script.

* travis cibuildwheel: install wheel

Co-authored-by: Magnus Edenhill &lt;magnus@edenhill.se&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,7 @@ jobs:
 # Install cibuildwheel if this is a tagged PR
 before_install:
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then tools/prepare-osx.sh ${INTERPRETER_VERSION} /tmp/venv && source /tmp/venv/bin/activate; fi
-  - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel --force-reinstall; fi
+  - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install -r tools/requirements-manylinux.txt --force-reinstall; fi
 
 # Install interceptors
 # Install librdkafka if not CIBW_BEFORE_BUILD
diff --git a/tools/fixup-wheels.sh b/tools/fixup-wheels.sh
@@ -117,9 +117,10 @@ fixup_wheel () {
         fixup_wheel_macosx
     fi
 
-    zip -r $fixed_whl .
-
     popd # tmpdir
+
+    wheel pack $tmpdir -d $fixed_wheelhouse
+
     rm -rf $tmpdir
 
     echo "Fixed $fixed_whl"
@@ -165,6 +166,3 @@ fi
 for wheel in $wheelhouse/*${wheelmatch}*.whl ; do
     fixup_wheel "$wheel"
 done
-
-
-
diff --git a/tools/requirements-manylinux.txt b/tools/requirements-manylinux.txt
@@ -1 +1,2 @@
 cibuildwheel
+wheel
