From ca3399768661aa2f6345482b5a397cb12f62ae91 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 18:00:17 +0000 Subject: [PATCH] final fixes, drop py 3.7 --- .github/scripts/build-linux.sh | 4 +-- .github/scripts/build-macos.sh | 3 +-- .github/scripts/test-linux.sh | 6 ++--- .github/workflows/ci.yml | 46 ---------------------------------- 4 files changed, 5 insertions(+), 54 deletions(-) diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index 1a75d33..5ee8374 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -10,9 +10,7 @@ CHECK_SHA256=.github/scripts/check_sha256.sh # List python versions ls /opt/python -if [ $PYTHON_VERSION == "3.7" ]; then - PYBIN="/opt/python/cp37-cp37m/bin" -elif [ $PYTHON_VERSION == "3.8" ]; then +if [ $PYTHON_VERSION == "3.8" ]; then PYBIN="/opt/python/cp38-cp38/bin" elif [ $PYTHON_VERSION == "3.9" ]; then PYBIN="/opt/python/cp39-cp39/bin" diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 200672a..63957bc 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -21,8 +21,7 @@ export PYTHON_INSTALLER_MACOS_VERSION=$MACOS_MIN_VERSION # Instead we install python.org binaries which are built with 10.6/10.9 target # and hence provide wider compatibility for the wheels we create. # See https://github.com/actions/setup-python/issues/26. -#git clone https://github.com/multi-build/multibuild.git -git clone https://github.com/matthew-brett/multibuild.git -b python-on-macos +git clone https://github.com/multi-build/multibuild.git pushd multibuild set +x # reduce noise source osx_utils.sh diff --git a/.github/scripts/test-linux.sh b/.github/scripts/test-linux.sh index 3e1538f..fa02bbf 100755 --- a/.github/scripts/test-linux.sh +++ b/.github/scripts/test-linux.sh @@ -6,9 +6,7 @@ cd /io # List python versions ls /opt/python -if [ $PYTHON_VERSION == "3.7" ]; then - PYBIN="/opt/python/cp37-cp37m/bin" -elif [ $PYTHON_VERSION == "3.8" ]; then +if [ $PYTHON_VERSION == "3.8" ]; then PYBIN="/opt/python/cp38-cp38/bin" elif [ $PYTHON_VERSION == "3.9" ]; then PYBIN="/opt/python/cp39-cp39/bin" @@ -16,6 +14,8 @@ elif [ $PYTHON_VERSION == "3.10" ]; then PYBIN="/opt/python/cp310-cp310/bin" elif [ $PYTHON_VERSION == "3.11" ]; then PYBIN="/opt/python/cp311-cp311/bin" +elif [ $PYTHON_VERSION == "3.12" ]; then + PYBIN="/opt/python/cp312-cp312/bin" else echo "Unsupported Python version $PYTHON_VERSION" exit 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2740d2e..d6b3c25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,12 +37,6 @@ jobs: matrix: config: # NOTE: When updating this list, also update the 'test' job! - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_x86_64 - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 @@ -74,12 +68,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.7' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 @@ -111,12 +99,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: macos-latest os-name: mac macos-min-version: '10.9' @@ -148,11 +130,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' @@ -235,12 +212,6 @@ jobs: # GitHub Actions doesn't support YAML anchors, # so this has to be duplicated here. config: - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_x86_64 - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 @@ -272,12 +243,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.7' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 @@ -309,12 +274,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: macos-latest os-name: mac macos-min-version: '10.9' @@ -346,11 +305,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64'