From 3df7ca313f620404b8a90539b389a67a4a4532a0 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 21 Nov 2023 10:39:15 +0000 Subject: [PATCH] fix: remove manylinux1 which is no longer supported by PyPI --- .github/workflows/python-publish.yml | 44 ---------------------------- README.md | 8 ++--- scripts/manylinux/build.sh | 14 --------- scripts/manylinux/check.sh | 2 +- 4 files changed, 4 insertions(+), 64 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 443f3aaa..de46a68c 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -23,49 +23,6 @@ jobs: name: python-package-distributions path: dist/ - build-wheels-manylinux1: - # Note: the 'manylinux1' image will no longer be supported by PyPA - # after 2022-01-01. - # See: https://github.com/pypa/manylinux/issues/994 - name: Build wheels on ubuntu-20.04 - x86_64 - manylinux1 - - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - - name: Build Wheels - uses: pypa/cibuildwheel@v2.16.2 - env: - CIBW_ARCHS_LINUX: x86_64 - CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 - CIBW_BUILD: "cp3[6-9]-manylinux*" # manylinux1 has no support for 3.10+ Python or PyPy - CIBW_ENVIRONMENT: > - CRC32C_PURE_PYTHON="0" - CRC32C_INSTALL_PREFIX="$(pwd)/usr" - CIBW_BUILD_VERBOSITY: 1 - # Build the C library inside CIBW so that the manylinux image is - # used to link the share library; otherwise, our extension wouldn't - # be able to link with it. - CIBW_BEFORE_BUILD: > - python -m pip install --only-binary --require-hashes -r scripts/requirements.txt && - cmake -S google_crc32c -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCRC32C_BUILD_TESTS=no \ - -DCRC32C_BUILD_BENCHMARKS=no \ - -DBUILD_SHARED_LIBS=yes \ - -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/usr && - make -C build all install - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: py.test -v {project}/tests/ - - - uses: actions/upload-artifact@v3 - with: - name: python-package-distributions - path: wheelhouse/ - build-wheels-linux: name: Build wheels on ${{ matrix.os }} - ${{ matrix.arch }} @@ -258,7 +215,6 @@ jobs: if: github.event_name == 'release' needs: - build-source-distribution - - build-wheels-manylinux1 - build-wheels-linux - build-wheels-macos - build-wheels-windows diff --git a/README.md b/README.md index adf13671..f59697f5 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,10 @@ Wheels are published for the following platforms / architectures: - `manylinux2010` platform, `x86_64` and `1686` architectures - `manylinux2014` platform, `aarch64` architecture -### Deprecated - -- `manylinux1` platform, `x86_64` architecture wheels will be built until - 2021-12-31, when the PyPA group drops support for the `manylinux1` image. - See: https://github.com/pypa/manylinux/issues/994 +### Unsupported Platforms +- `manylinux1` platform, `x86_64` architecture support has ended. +See https://github.com/pypa/manylinux/issues/994. ## Mac OS diff --git a/scripts/manylinux/build.sh b/scripts/manylinux/build.sh index 31e18b7b..1b0e565f 100755 --- a/scripts/manylinux/build.sh +++ b/scripts/manylinux/build.sh @@ -25,20 +25,6 @@ REPO_ROOT=$(dirname ${SCRIPTS_DIR}) cd $REPO_ROOT git submodule update --init --recursive -# Note: PyPA's support for the 'manylinux1' image ends on 2022-01-01. -# See: https://github.com/pypa/manylinux/issues/994 -# No 3.1* support for 'manylinux1'. -if [[ "${BUILD_PYTHON}" != "3.1"* ]]; then - docker pull quay.io/pypa/manylinux1_x86_64 - docker run \ - --rm \ - --interactive \ - --volume ${REPO_ROOT}:/var/code/python-crc32c/ \ - --env BUILD_PYTHON=${BUILD_PYTHON} \ - quay.io/pypa/manylinux1_x86_64 \ - /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh -fi - docker pull quay.io/pypa/manylinux2010_x86_64 docker run \ --rm \ diff --git a/scripts/manylinux/check.sh b/scripts/manylinux/check.sh index a069ff9d..25db1687 100755 --- a/scripts/manylinux/check.sh +++ b/scripts/manylinux/check.sh @@ -20,7 +20,7 @@ echo "CHECKING ON LINUX" VERSION=$(awk "/version \= ([0-9.]+)/" setup.cfg) PACKAGE_VERSION=${VERSION:10} -WHEEL_FILE="wheels/google_crc32c-${PACKAGE_VERSION}-cp36-cp36m-manylinux1_x86_64.whl" +WHEEL_FILE="wheels/google_crc32c-${PACKAGE_VERSION}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" PYTHON=python3.7 # Using pyenv, set 3.7.13 as a local python version.