Merge branch 'indygreg:main' into system-zstd-cffi

Author: mgorny

.github/workflows/external-zstd.yml

@@ -25,6 +25,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
+        env:
+          PIP_CONSTRAINT: 'ci/constraints.txt'
         run: |
           python -m pip install --config-settings=--build-option=--system-zstd .
 
@@ -50,5 +52,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
+        env:
+          PIP_CONSTRAINT: 'ci/constraints.txt'
         run: |
           python -m pip install --config-settings=--build-option=--system-zstd .

.github/workflows/sphinx.yml

@@ -13,6 +13,8 @@ jobs:
         with:
           version: "0.4.29"
       - name: Run Sphinx
+        env:
+          PIP_CONSTRAINT: 'ci/constraints.txt'
         run: |
           uv venv --python 3.12 venv
           source venv/bin/activate

.github/workflows/test.yml

@@ -80,6 +80,8 @@ jobs:
       # TODO enable once PyO3 supports 3.13.
       - name: Build (Rust)
         if: matrix.arch == 'x64' && matrix.py != '3.13'
+        env:
+          PIP_CONSTRAINT: 'ci/constraints.txt'
         run: |
           python -m pip install --config-settings='--build-option=--rust-backend' -e .
 

.github/workflows/wheel.yml

@@ -104,6 +104,10 @@ jobs:
         arch:
           - 'x86'
           - 'x64'
+          - 'arm64'
+        exclude:
+          - py: '3.8'
+            arch: 'arm64'
     runs-on: 'windows-2022'
     env:
       ZSTD_WARNINGS_AS_ERRORS: '1'
@@ -112,14 +116,25 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.py }}
-          architecture: ${{ matrix.arch }}
+          architecture: ${{ matrix.arch == 'arm64' && 'x64' || matrix.arch }}
 
       - uses: actions/checkout@v4
 
       - name: Build Wheel
+        if: matrix.arch != 'arm64'
         run: |
           python -m pip wheel -w dist .
 
+      - name: Build Wheel
+        if: matrix.arch == 'arm64'
+        shell: bash
+        run: |
+          python -m pip install cibuildwheel
+          export CIBW_ARCHS=ARM64
+          export CIBW_BUILD=cp$(echo ${{ matrix.py }} | tr -d .)-*
+          export CIBW_BUILD_VERBOSITY=1
+          cibuildwheel --output-dir dist --arch ARM64
+
       - name: Upload Wheel
         uses: actions/upload-artifact@v4
         with:

ci/constraints.txt

@@ -0,0 +1,5 @@
+# 69.0.0 breaks handling of --config-settings=--build-option, which our CI
+# relies on. So constrained to an older version until we figure out a
+# workaround. See comment at
+# https://github.com/pypa/pip/issues/11859#issuecomment-2132287974.
+setuptools<69.0.0

pyproject.toml

@@ -29,11 +29,7 @@ Documentation = "https://python-zstandard.readthedocs.io/en/latest/"
 [build-system]
 requires = [
     "cffi>=1.17.0",
-    # 69.0.0 breaks handling of --config-settings=--build-option, which our CI
-    # relies on. So constrained to an older version until we figure out a
-    # workaround. See comment at
-    # https://github.com/pypa/pip/issues/11859#issuecomment-2132287974.
-    "setuptools<69.0.0",
+    "setuptools",
 ]
 # Need to use legacy backend because setup_zstd.py breaks build isolation.
 build-backend = "setuptools.build_meta:__legacy__"

setup.py

@@ -34,6 +34,27 @@
 if sys.version_info[0:2] >= (3, 13):
     MINIMUM_CFFI_VERSION = "1.17"
 
+ext_suffix = os.environ.get("SETUPTOOLS_EXT_SUFFIX")
+if ext_suffix:
+    import sysconfig
+    # setuptools._distutils.command.build_ext doesn't use
+    # SETUPTOOLS_EXT_SUFFIX like setuptools.command.build_ext does.
+    # Work around the issue so that cross-compilation can work
+    # properly.
+    sysconfig.get_config_vars()["EXT_SUFFIX"] = ext_suffix
+    try:
+        # Older versions of python didn't have EXT_SUFFIX, and setuptools
+        # sets its own value, but since we've already set one, we don't
+        # want setuptools to overwrite it.
+        import setuptools._distutils.compat.py39 as py39compat
+    except ImportError:
+        try:
+            import setuptools._distutils.py39compat as py39compat
+        except ImportError:
+            pass
+    if py39compat:
+        py39compat.add_ext_suffix = lambda vars: None
+
 try:
     import cffi