From a40c3f8ecee12a800151d8375ed5272eccd8fe23 Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Mon, 4 Nov 2019 11:47:14 -0500 Subject: Fix manylinux for 3.8 --- .ci/travis-build-wheels.sh | 6 ++++-- .ci/travis-release.sh | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.ci/travis-build-wheels.sh b/.ci/travis-build-wheels.sh index a7fafb9..a36e281 100755 --- a/.ci/travis-build-wheels.sh +++ b/.ci/travis-build-wheels.sh @@ -38,9 +38,11 @@ _upload_wheels() { if [ "${TRAVIS_OS_NAME}" == "linux" ]; then for pyver in ${RELEASE_PYTHON_VERSIONS}; do ML_PYTHON_VERSION=$(python3 -c \ - "print('cp{maj}{min}-cp{maj}{min}m'.format( \ + "print('cp{maj}{min}-cp{maj}{min}{s}'.format( \ maj='${pyver}'.split('.')[0], \ - min='${pyver}'.split('.')[1]))") + min='${pyver}'.split('.')[1], \ + s='m' if tuple('${pyver}'.split('.')) < ('3', '8') \ + else ''))") for arch in x86_64 i686; do ML_IMAGE="quay.io/pypa/manylinux1_${arch}" diff --git a/.ci/travis-release.sh b/.ci/travis-release.sh index b3cb72b..664708b 100755 --- a/.ci/travis-release.sh +++ b/.ci/travis-release.sh @@ -30,8 +30,11 @@ P="${PYMODULE}-${PACKAGE_VERSION}" expected_wheels=() for pyver in ${RELEASE_PYTHON_VERSIONS}; do - pyver="${pyver//./}" - abitag="cp${pyver}-cp${pyver}m" + abitag=$(python -c \ + "print('cp{maj}{min}-cp{maj}{min}{s}'.format( \ + maj='${pyver}'.split('.')[0], \ + min='${pyver}'.split('.')[1], + s='m' if tuple('${pyver}'.split('.')) < ('3', '8') else ''))") for plat in "${release_platforms[@]}"; do expected_wheels+=("${P}-${abitag}-${plat}.whl") done -- cgit v1.2.3