Merge pull request #1289 from mattip/remove-pypy3.7-v7.3.8

do not use pypy3.7-v7.3.8
pypa · Feb 24, 2022 · 3876535 · 3876535
2 parents 5cd6f37 + 66934f2
commit 3876535
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -139,7 +139,8 @@ COPY build_scripts/install-pypy.sh \
      build_scripts/pypy.sha256 \
      build_scripts/finalize-python.sh \
      /build_scripts/
-RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.8
+# PyPy 3.7 v7.3.8 is broken, see https://foss.heptapod.net/pypy/pypy/-/issues/3688
+RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7
 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.8
 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.9 7.3.8
 COPY --from=build_cpython36 /opt/_internal /opt/_internal/

diff --git a/docker/build_scripts/install-pypy.sh b/docker/build_scripts/install-pypy.sh
@@ -31,9 +31,10 @@ cd /tmp
 case ${AUDITWHEEL_ARCH} in
 	x86_64) PYPY_ARCH=linux64;;
 	i686) PYPY_ARCH=linux32;;
-	aarch64) PYPY_ARCH=aarch64-portable;;
+	aarch64) PYPY_ARCH=aarch64;;
 	*) echo "No PyPy for ${AUDITWHEEL_ARCH}"; exit 0;;
 esac
+
 if [ "${AUDITWHEEL_POLICY}" == "manylinux2010" ]; then
 	PYPY_VERSION=7.3.7  # versions after this one do not support manylinux2010
 	if [ "${PYTHON_VERSION}" != "3.7" ] && [ "${PYTHON_VERSION}" != "3.8" ]; then
@@ -42,9 +43,15 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2010" ]; then
 	fi
 fi
 
-TARBALL=pypy${PYTHON_VERSION}-v${PYPY_VERSION}-${PYPY_ARCH}.tar.bz2
-TMPDIR=/tmp/${TARBALL/.tar.bz2//}
-TMPDIR=${TMPDIR/-portable//}
+if [ "${PYPY_ARCH}-${PYPY_VERSION}" == "aarch64-7.3.8" ]; then
+	TARBALL_FLAVOUR="-portable"
+else
+	TARBALL_FLAVOUR=""
+fi
+
+EXPAND_NAME=pypy${PYTHON_VERSION}-v${PYPY_VERSION}-${PYPY_ARCH}
+TMPDIR=/tmp/${EXPAND_NAME}
+TARBALL=${EXPAND_NAME}${TARBALL_FLAVOUR}.tar.bz2
 PREFIX="/opt/_internal"
 
 mkdir -p ${PREFIX}

diff --git a/docker/build_scripts/pypy.sha256 b/docker/build_scripts/pypy.sha256
@@ -1,5 +1,7 @@
+a1a84882525dd574c4b051b66e9b7ef0e132392acc2f729420d7825f96835216  pypy3.7-v7.3.7-aarch64.tar.bz2
 0ab9e2e8ae1ac463bb811b9d3ba24d138f41f7378c17ca9e2d8dee51bf151d19  pypy3.7-v7.3.7-linux32.tar.bz2
 8332f923755441fedfe4767a84601c94f4d6f8475384406cb5f259ad8d0b2002  pypy3.7-v7.3.7-linux64.tar.bz2
+cbd44e0a9146b3c03a9d14b265774a848f387ed846316c3e984847e278d0efd3  pypy3.8-v7.3.7-aarch64.tar.bz2
 dfb9d005f0fc917edc60fd618143e4934c412f9168b55166f5519ba0a3b1a835  pypy3.8-v7.3.7-linux32.tar.bz2
 5dee37c7c3cb8b160028fbde3a5901c68043dfa545a16794502b897d4bc40d7e  pypy3.8-v7.3.7-linux64.tar.bz2
 639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2  pypy3.7-v7.3.8-aarch64-portable.tar.bz2