From 59e2fcaa189f608aebe88dd797f3a8500bc197ea Mon Sep 17 00:00:00 2001 From: Agis Kounelis Date: Fri, 8 Mar 2024 14:20:59 +0200 Subject: [PATCH 1/3] Remove Python 3.7 CI jobs --- .github/workflows/ci.yml | 11 ++--------- .github/workflows/daily-test-build-numpy.yml | 6 ++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87be973d07..e0c192923e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-12, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11"] fail-fast: false env: # 11.7 necessary due to: https://github.com/actions/setup-python/issues/682#issuecomment-1604261330 - MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && contains(fromJSON('["3.7", "3.8"]'), matrix.python-version) && '11.7' || '11' }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && matrix.python-version == '3.8' ? '11.7' : '11' }} #MACOSX_DEPLOYMENT_TARGET: "10.11" # On windows-2019 we are using the Visual Studio generator, which is multi-config and places the build artifacts in a subdirectory steps: @@ -45,13 +45,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - run: rm -rf $RUNNER_TOOL_CACHE/Python/3.7.17 - if: matrix.os == 'macos-12' && matrix.python-version == '3.7' - - uses: actions/setup-python@v4 - with: - python-version: 3.7.17 - if: matrix.os == 'macos-12' && matrix.python-version == '3.7' - - name: Print Python version run: | which python diff --git a/.github/workflows/daily-test-build-numpy.yml b/.github/workflows/daily-test-build-numpy.yml index f2c779fb39..bd74fb9a4d 100644 --- a/.github/workflows/daily-test-build-numpy.yml +++ b/.github/workflows/daily-test-build-numpy.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-12, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11"] include: # https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg - python-version: "3.11" @@ -27,14 +27,12 @@ jobs: numpy-version: "1.19.3" - python-version: "3.8" numpy-version: "1.17.3" - - python-version: "3.7" - numpy-version: "1.16.5" fail-fast: false env: TILEDB_VERSION: ${{ github.event.inputs.libtiledb_version }} # 11.7 necessary due to: https://github.com/actions/setup-python/issues/682#issuecomment-1604261330 #MACOSX_DEPLOYMENT_TARGET: "10.15" - MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-11' && contains(fromJson('["3.7", "3.8"]'), matrix.python-version) && '11.7' || '11' }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && matrix.python-version == '3.8' ? '11.7' : '11' }} VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' steps: - name: Checkout TileDB-Py `dev` From 1395ea21bfa27d75067facd6eaf1f97e713f488a Mon Sep 17 00:00:00 2001 From: Agis Kounelis Date: Fri, 8 Mar 2024 18:13:28 +0200 Subject: [PATCH 2/3] Add exclusions for cp37 for the release wheels --- misc/azure-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/azure-release.yml b/misc/azure-release.yml index 2e0be78125..f14ab27098 100644 --- a/misc/azure-release.yml +++ b/misc/azure-release.yml @@ -71,7 +71,7 @@ stages: matrix: linux_py: imageName: "ubuntu-latest" - CIBW_SKIP: "cp36-* *_i686 pp* *musllinux*" + CIBW_SKIP: "cp36-* cp37-* *_i686 pp* *musllinux*" CIBW_BUILD_VERBOSITY: 3 CIBW_ARCHS_MACOS: "" macOS_py: @@ -79,7 +79,7 @@ stages: MACOSX_DEPLOYMENT_TARGET: 11 TILEDB_INSTALL: "$(Pipeline.Workspace)/.libtiledb_dist/$(LIBTILEDB_SHA)-macos-x86_64" CIBW_ARCHS_MACOS: "x86_64" - CIBW_SKIP: "cp36-* pp*" + CIBW_SKIP: "cp36-* cp37-* pp*" CIBW_TEST_SKIP: "cp37-*" CIBW_BUILD_VERBOSITY: 3 macOS_arm64_py: @@ -92,7 +92,7 @@ stages: CIBW_SKIP: "cp36-* cp37-* pp*" windows_py: imageName: "windows-latest" - CIBW_SKIP: "cp36-* *-win32 pp*" + CIBW_SKIP: "cp36-* cp37-* *-win32 pp*" CIBW_BUILD_VERBOSITY: 3 CIBW_ARCHS_MACOS: "" pool: From 943bdd6adf4e322e88e15e461425a81ef62b5416 Mon Sep 17 00:00:00 2001 From: Isaiah Norton Date: Fri, 8 Mar 2024 16:00:09 -0500 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0c192923e..7e5053f27f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false env: # 11.7 necessary due to: https://github.com/actions/setup-python/issues/682#issuecomment-1604261330 - MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && matrix.python-version == '3.8' ? '11.7' : '11' }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && matrix.python-version == '3.8' && '11.7' || '11' }} #MACOSX_DEPLOYMENT_TARGET: "10.11" # On windows-2019 we are using the Visual Studio generator, which is multi-config and places the build artifacts in a subdirectory steps: