From c7075ce991f1a7df4b8559cb8f7133358e0039e8 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 9 Jun 2020 22:57:22 +0200 Subject: [PATCH] Revert "Configure a simple http server to serve the pre compiled wheels" This reverts commit 4e1b2eafdaf85abc2d5d1fc4678aece617defb4e. --- snap/local/build_and_install.sh | 10 +++------- snap/local/compile_native_wheels.sh | 5 ++--- .../cffi-1.14.0-cp36-cp36m-linux_aarch64.whl | Bin .../cffi-1.14.0-cp36-cp36m-linux_armv7l.whl | Bin .../cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl | Bin .../cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl | Bin .../cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl | Bin .../cryptography-2.9.2-cp36-cp36m-linux_i686.whl | Bin 8 files changed, 5 insertions(+), 10 deletions(-) rename snap/local/packages/{cffi => }/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl (100%) rename snap/local/packages/{cffi => }/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl (100%) rename snap/local/packages/{cffi => }/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl (100%) rename snap/local/packages/{cryptography => }/cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl (100%) rename snap/local/packages/{cryptography => }/cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl (100%) rename snap/local/packages/{cryptography => }/cryptography-2.9.2-cp36-cp36m-linux_i686.whl (100%) diff --git a/snap/local/build_and_install.sh b/snap/local/build_and_install.sh index b5883bc8a..6058fa359 100755 --- a/snap/local/build_and_install.sh +++ b/snap/local/build_and_install.sh @@ -26,15 +26,11 @@ source "${DIR}/common.sh" RegisterQemuHandlers ResolveArch "${SNAP_ARCH}" +docker run --net=host -d --rm -v "${DIR}/packages:/data/packages" --name pypiserver pypiserver/pypiserver tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt > snap-constraints.txt -pushd "${DIR}/packages" -"${CERTBOT_DIR}/tools/simple_http_server.py" 8080 >/dev/null 2>&1 & -HTTP_SERVER_PID="$!" -popd - function cleanup() { - kill "${HTTP_SERVER_PID}" + docker rm --force pypiserver } trap cleanup EXIT @@ -44,7 +40,7 @@ docker run \ --net=host \ -v "${CERTBOT_DIR}:/certbot" \ -w "/certbot" \ - -e "PIP_EXTRA_INDEX_URL=http://localhost:8080" \ + -e "PIP_EXTRA_INDEX_URL=http://localhost:8080/simple" \ "adferrand/snapcraft:${DOCKER_ARCH}-stable" \ snapcraft diff --git a/snap/local/compile_native_wheels.sh b/snap/local/compile_native_wheels.sh index 380d6c637..10e8435dd 100755 --- a/snap/local/compile_native_wheels.sh +++ b/snap/local/compile_native_wheels.sh @@ -32,9 +32,8 @@ for SNAP_ARCH in ${TARGET_ARCHS}; do && python3 -m venv /build/venv \ && /build/venv/bin/pip install wheel \ && /build/venv/bin/pip wheel cryptography cffi -c snap-constraints.txt -w /build \ -&& mkdir -p /workspace/packages/{cffi,cryptography} \ -&& mv /build/cryptography* /workspace/packages/cryptography \ -&& mv /build/cffi* /workspace/packages/cffi \ +&& mkdir -p /workspace/packages \ +&& mv /build/cryptography* /build/cffi* /workspace/packages \ && chmod 775 /workspace/packages \ && chmod 664 /workspace/packages/* " diff --git a/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl b/snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl similarity index 100% rename from snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl rename to snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl diff --git a/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl b/snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl similarity index 100% rename from snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl rename to snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl diff --git a/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl b/snap/local/packages/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl similarity index 100% rename from snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl rename to snap/local/packages/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl diff --git a/snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl b/snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl similarity index 100% rename from snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl rename to snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_aarch64.whl diff --git a/snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl b/snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl similarity index 100% rename from snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl rename to snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_armv7l.whl diff --git a/snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_i686.whl b/snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_i686.whl similarity index 100% rename from snap/local/packages/cryptography/cryptography-2.9.2-cp36-cp36m-linux_i686.whl rename to snap/local/packages/cryptography-2.9.2-cp36-cp36m-linux_i686.whl