Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop building manylinux1 container images #437

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/build-manylinux-container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ jobs:
- 2014
- _2_24 # PEP 600
include:
- IMAGE:
ARCH: x86_64
QEMU_ARCH: amd64
YEAR: 1
- IMAGE:
ARCH: x86_64
QEMU_ARCH: amd64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-n-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ jobs:
- cp36-cp36m
- cp37-cp37m
- cp38-cp38
- cp39-cp39
- cp39-cp39 # NOTE: This version and newer ship pip supporting PEP 600, meaning that they don't need to be built with manylinux2010/manylinux2014
- cp310-cp310
- cp311-cp311
manylinux-year-target:
Expand Down
3 changes: 0 additions & 3 deletions build-scripts/build-manylinux-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ THIS_SCRIPT_DIR_PATH=$(dirname "$(readlink -m $(type -p "${0}"))")
IMAGE_SCRIPTS_DIR_PATH="${THIS_SCRIPT_DIR_PATH}/manylinux-container-image"

source "${IMAGE_SCRIPTS_DIR_PATH}/get-static-deps-dir.sh"
source "${IMAGE_SCRIPTS_DIR_PATH}/activate-userspace-tools.sh"

SRC_DIR=/io
GIT_DIR="${SRC_DIR}/.git"
Expand Down Expand Up @@ -59,8 +58,6 @@ MANYLINUX_TAG="$(
# Avoid creation of __pycache__/*.py[c|o]
export PYTHONDONTWRITEBYTECODE=1

import_userspace_tools

PIP_GLOBAL_ARGS=
if [ -n "$DEBUG" ]
then
Expand Down
13 changes: 4 additions & 9 deletions build-scripts/manylinux-container-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ ADD update-packages.sh /root/update-packages.sh
RUN ./update-packages.sh

ADD build_utils.sh /root/build_utils.sh
ADD install_perl.sh /root/install_perl.sh
RUN ./install_perl.sh "${RELEASE}"
ADD install_libffi.sh /root/install_libffi.sh
RUN ./install_libffi.sh "${RELEASE}"
#ADD install_perl.sh /root/install_perl.sh
#RUN ./install_perl.sh "${RELEASE}"
#RUN apt update && apt install -y perl && apt clean
ADD install_openssl.sh /root/install_openssl.sh
ADD openssl-version.sh /root/openssl-version.sh
RUN ./install_openssl.sh "${RELEASE}"
Expand All @@ -21,14 +20,10 @@ ADD install_virtualenv.sh /root/install_virtualenv.sh
RUN ./install_virtualenv.sh

# \pylibssh
ADD install-userspace-tools.sh /root/install-userspace-tools.sh
ADD activate-userspace-tools.sh /root/activate-userspace-tools.sh
RUN ./install-userspace-tools.sh
ADD make-static-deps-dir.sh /root/make-static-deps-dir.sh
ADD get-static-deps-dir.sh /root/get-static-deps-dir.sh
RUN ./make-static-deps-dir.sh
ADD install_zlib.sh /root/install_zlib.sh
RUN ./install_zlib.sh
RUN apt update && apt install -y cmake && apt clean
ADD install_libssh.sh /root/install_libssh.sh
RUN ./install_libssh.sh "${LIBSSH_VERSION}"
# /pylibssh

This file was deleted.

32 changes: 0 additions & 32 deletions build-scripts/manylinux-container-image/install-userspace-tools.sh

This file was deleted.

29 changes: 0 additions & 29 deletions build-scripts/manylinux-container-image/install_libffi.sh

This file was deleted.

3 changes: 0 additions & 3 deletions build-scripts/manylinux-container-image/install_libssh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ git clone \
https://git.libssh.org/projects/${LIB_NAME}.git \
"${LIB_CLONE_DIR}"

source activate-userspace-tools.sh
import_userspace_tools

mkdir -pv "${LIB_BUILD_DIR}"
pushd "${LIB_BUILD_DIR}"
# For some reason, libssh has to be compiled as a shared object.
Expand Down
27 changes: 0 additions & 27 deletions build-scripts/manylinux-container-image/install_zlib.sh

This file was deleted.

2 changes: 2 additions & 0 deletions docs/changelog-fragments/437.deprecation.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Stopped updating ``manylinux1`` container images for building
wheels in the CI -- by :user:`webknjaz`