From 339669e8f5c6ef81294d73ee5966eb1584201704 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 5 Feb 2025 21:38:05 -0600 Subject: [PATCH 1/4] Revert "PYTHON-5058 Build linux aarch64 wheel using native runner and omit ppc64le and s390x wheels (#2077)" This reverts commit 9082a4be23622458ee350c3171bc754cdf1db89a. --- .github/workflows/dist.yml | 7 +++---- doc/changelog.rst | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 5100c70d43..a4c5a8279b 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -35,10 +35,9 @@ jobs: # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026 buildplat: - [ubuntu-20.04, "manylinux_x86_64", "cp3*-manylinux_x86_64"] - - [ubuntu-24.04-arm, "manylinux_aarch64", "cp3*-manylinux_aarch64"] - # Disabled pending PYTHON-5058 - # - [ubuntu-24.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"] - # - [ubuntu-24.04, "manylinux_s390x", "cp3*-manylinux_s390x"] + - [ubuntu-20.04, "manylinux_aarch64", "cp3*-manylinux_aarch64"] + - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"] + - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"] - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"] - [windows-2019, "win_amd6", "cp3*-win_amd64"] - [windows-2019, "win32", "cp3*-win32"] diff --git a/doc/changelog.rst b/doc/changelog.rst index 1f3efb8ad0..4942d85de8 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -11,7 +11,6 @@ Changes in Version 4.11.0 (YYYY/MM/DD) A future minor release of PyMongo will raise the minimum supported MongoDB Server version from 4.0 to 4.2. This is in accordance with [MongoDB Software Lifecycle Schedules](https://www.mongodb.com/legal/support-policy/lifecycles). **Support for MongoDB Server 4.0 will be dropped in a future release!** -.. warning:: This version does not include wheels for ``ppc64le`` or ``s390x`` architectures, see `PYTHON-5058`_ for more information. PyMongo 4.11 brings a number of changes including: @@ -50,7 +49,6 @@ in this release. .. _PyMongo 4.11 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=40784 .. _PYTHON-5027: https://jira.mongodb.org/browse/PYTHON-5027 .. _PYTHON-5024: https://jira.mongodb.org/browse/PYTHON-5024 -.. _PYTHON-5058: https://jira.mongodb.org/browse/PYTHON-5058 Changes in Version 4.10.1 (2024/10/01) -------------------------------------- From f95f6080af1fbd51930ecb3da3a271eb921bc709 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 5 Feb 2025 21:39:56 -0600 Subject: [PATCH 2/4] PYTHON-5058 Restore alternate architecture builds --- .github/workflows/dist.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index a4c5a8279b..8c3d640a89 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -62,7 +62,11 @@ jobs: if: runner.os == 'Linux' uses: docker/setup-qemu-action@v3 with: - platforms: all + # setup-qemu-action by default uses `tonistiigi/binfmt:latest` image, + # which is out of date. This causes seg faults during build. + # Here we manually fix the version. + image: tonistiigi/binfmt:qemu-v8.1.5 + platforms: arm64 - name: Install cibuildwheel # Note: the default manylinux is manylinux2014 From 969e26c0b8274f084ff5d28c7969ebed34664380 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 5 Feb 2025 21:45:30 -0600 Subject: [PATCH 3/4] undo changelog --- doc/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/changelog.rst b/doc/changelog.rst index 4942d85de8..1f3efb8ad0 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -11,6 +11,7 @@ Changes in Version 4.11.0 (YYYY/MM/DD) A future minor release of PyMongo will raise the minimum supported MongoDB Server version from 4.0 to 4.2. This is in accordance with [MongoDB Software Lifecycle Schedules](https://www.mongodb.com/legal/support-policy/lifecycles). **Support for MongoDB Server 4.0 will be dropped in a future release!** +.. warning:: This version does not include wheels for ``ppc64le`` or ``s390x`` architectures, see `PYTHON-5058`_ for more information. PyMongo 4.11 brings a number of changes including: @@ -49,6 +50,7 @@ in this release. .. _PyMongo 4.11 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=40784 .. _PYTHON-5027: https://jira.mongodb.org/browse/PYTHON-5027 .. _PYTHON-5024: https://jira.mongodb.org/browse/PYTHON-5024 +.. _PYTHON-5058: https://jira.mongodb.org/browse/PYTHON-5058 Changes in Version 4.10.1 (2024/10/01) -------------------------------------- From ac5f61b8e9a3c005ab72f7908302d5c3fafac979 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 6 Feb 2025 06:39:01 -0600 Subject: [PATCH 4/4] use all platforms --- .github/workflows/dist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 8c3d640a89..3dee8f581c 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -66,7 +66,7 @@ jobs: # which is out of date. This causes seg faults during build. # Here we manually fix the version. image: tonistiigi/binfmt:qemu-v8.1.5 - platforms: arm64 + platforms: all - name: Install cibuildwheel # Note: the default manylinux is manylinux2014