Skip to content

Commit 7e96368

Browse files
committed
Work around wheel conversion and wheel install bugs
Wheel conversion adds a tag but doesn't name the file after it. wheel installation using pip fails if any of the compatibility 3-tuple is specified (mandatory for compiled extensions) and the entire tuple doesn't match (even if the other members are 'none' or 'any'.
1 parent c63762b commit 7e96368

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ build_tag_release:
66
paths:
77
- wallycore-android-jni.tar.gz
88
- wallycore-android-jni.tar.gz.sha256
9-
- wallycore-0.3.0-py27-none-linux_x86_64.whl
10-
- wallycore-0.3.0-py27-none-linux_x86_64.whl.sha256
11-
- wallycore-0.3.0-py35-none-linux_x86_64.whl
12-
- wallycore-0.3.0-py35-none-linux_x86_64.whl.sha256
9+
- wallycore-0.3.0-cp27-cp27mu-linux_x86_64.whl
10+
- wallycore-0.3.0-cp27-cp27mu-linux_x86_64.whl.sha256
11+
- wallycore-0.3.0-cp35-cp35m-linux_x86_64.whl
12+
- wallycore-0.3.0-cp35-cp35m-linux_x86_64.whl.sha256
1313
- wallycore-linux_x86_64-python2.tar.gz
1414
- wallycore-linux_x86_64-python2.tar.gz.sha256
1515
- wallycore-linux_x86_64-python3.tar.gz

tools/build_python_eggs.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ function build {
3131
# Create a wheel from the .egg
3232
cd $NAME-$1
3333
wheel convert *.egg
34-
WHEEL_NAME=$(ls *whl | sed "s/-any/-$PLATFORM/")
34+
COMPAT_INFO=$(unzip -p *.whl '*/WHEEL' | grep 'Tag: ' | sed 's/Tag: //')
35+
WHEEL_NAME=$(ls *whl | sed "s/-py.*/-$COMPAT_INFO.whl/")
3536
mv *.whl ../$WHEEL_NAME
3637
cd ..
3738
shasum -a 256 $WHEEL_NAME > $WHEEL_NAME.sha256

0 commit comments

Comments
 (0)