Merge branch '2.x'

# Conflicts: # cibuildwheel/__init__.py # cibuildwheel/options.py # cibuildwheel/resources/pinned_docker_images.cfg # cibuildwheel/resources/virtualenv.toml # docs/setup.md # examples/github-deploy.yml # unit_test/options_test.py
2025-03-21 10:41:39 +00:00
parent 1826f70682 42728e866b
commit 54a0cd0b22
19 changed files with 41 additions and 36 deletions
@@ -97,7 +97,7 @@ jobs:
      - uses: actions/setup-python@v5
      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.23.0
+        run: python -m pip install cibuildwheel==2.23.1
      - name: Build wheels
        run: python -m cibuildwheel --output-dir wheelhouse
@@ -217,6 +217,13 @@ Changelog
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 ### v2.23.1
 _15 March 2025_
 - ⚠️ Added warnings when the shorthand values `manylinux1`, `manylinux2010`, `manylinux_2_24`, and `musllinux_1_1` are used to specify the images in linux builds. The shorthand to these (unmaintainted) images will be removed in v3.0. If you want to keep using these images, explicitly opt-in using the full image URL, which can be found in [this file](https://github.com/pypa/cibuildwheel/blob/v2.23.1/cibuildwheel/resources/pinned_docker_images.cfg). (#2312)
 - 🛠 Dependency updates, including a manylinux update which fixes an [issue with rustup](https://github.com/pypa/cibuildwheel/issues/2303). (#2315)
 ### v2.23.0
 _1 March 2025_
@@ -263,15 +270,6 @@ _2 October 2024_
 Note: the default [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) is **scheduled to change** from `manylinux2014` to `manylinux_2_28` in a cibuildwheel release on or after **6th May 2025** - you can set the value now to avoid getting upgraded if you want. (#1992)
 ### v2.21.1
 _16 September 2024_
 - 🐛 Fix a bug in the Linux build, where files copied to the container would have invalid ownership permissions (#2007)
 - 🐛 Fix a bug on Windows where cibuildwheel would call upon `uv` to install dependencies for versions of CPython that it does not support (#2005)
 - 🐛 Fix a bug where `uv 0.4.10` would not use the right Python when testing on Linux. (#2008)
 - 🛠 Bump our documentation pins, fixes an issue with a missing package (#2011)
 <!-- END bin/update_readme_changelog.py -->
 ---
@@ -1 +1 @@
-__version__ = "2.23.0"
+__version__ = "2.23.1"
@@ -4,6 +4,13 @@ title: Changelog
 # Changelog
 ### v2.23.1
 _15 March 2025_
 - ⚠️ Added warnings when the shorthand values `manylinux1`, `manylinux2010`, `manylinux_2_24`, and `musllinux_1_1` are used to specify the images in linux builds. The shorthand to these (unmaintainted) images will be removed in v3.0. If you want to keep using these images, explicitly opt-in using the full image URL, which can be found in [this file](https://github.com/pypa/cibuildwheel/blob/v2.23.1/cibuildwheel/resources/pinned_docker_images.cfg). (#2312)
 - 🛠 Dependency updates, including a manylinux update which fixes an [issue with rustup](https://github.com/pypa/cibuildwheel/issues/2303). (#2315)
 ### v2.23.0
 _1 March 2025_
@@ -142,7 +142,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
 If you use GitHub Actions for builds, you can use cibuildwheel as an action:
 ```yaml
-uses: pypa/cibuildwheel@v2.23.0
+uses: pypa/cibuildwheel@v2.23.1
 ```
 This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
@@ -164,7 +164,7 @@ The second option, and the only one that supports other CI systems, is using a `
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.23.0
+cibuildwheel==2.23.1
 ```
 Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this:
@@ -328,7 +328,7 @@ Solutions to this vary, but the simplest is to use pipx:
 # most runners have pipx preinstalled, but in case you don't
 python3 -m pip install pipx
-pipx run cibuildwheel==2.23.0 --output-dir wheelhouse
+pipx run cibuildwheel==2.23.1 --output-dir wheelhouse
 pipx run twine upload wheelhouse/*.whl
 ```
@@ -9,7 +9,7 @@ environment:
 stack: python 3.12
-install: python -m pip install cibuildwheel==2.23.0
+install: python -m pip install cibuildwheel==2.23.1
 build_script: python -m cibuildwheel --output-dir wheelhouse
@@ -6,7 +6,7 @@ jobs:
    - bash: |
        set -o errexit
        python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==2.23.0
+        pip3 install cibuildwheel==2.23.1
      displayName: Install dependencies
    - bash: cibuildwheel --output-dir wheelhouse .
      displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
    - bash: |
        set -o errexit
        python3 -m pip install --upgrade pip
-        python3 -m pip install cibuildwheel==2.23.0
+        python3 -m pip install cibuildwheel==2.23.1
      displayName: Install dependencies
    - bash: cibuildwheel --output-dir wheelhouse .
      displayName: Build wheels
@@ -34,7 +34,7 @@ jobs:
    - bash: |
        set -o errexit
        python -m pip install --upgrade pip
-        pip install cibuildwheel==2.23.0
+        pip install cibuildwheel==2.23.1
      displayName: Install dependencies
    - bash: cibuildwheel --output-dir wheelhouse .
      displayName: Build wheels
@@ -11,7 +11,7 @@ jobs:
      - run:
          name: Build the Linux wheels.
          command: |
-            python3 -m pip install --user cibuildwheel==2.23.0
+            python3 -m pip install --user cibuildwheel==2.23.1
            cibuildwheel --output-dir wheelhouse
      - store_artifacts:
          path: wheelhouse/
@@ -28,7 +28,7 @@ jobs:
      - run:
          name: Build the Linux aarch64 wheels.
          command: |
-            python3 -m pip install --user cibuildwheel==2.23.0
+            python3 -m pip install --user cibuildwheel==2.23.1
            python3 -m cibuildwheel --output-dir wheelhouse
      - store_artifacts:
          path: wheelhouse/
@@ -44,7 +44,7 @@ jobs:
          name: Build the OS X wheels.
          command: |
            sudo softwareupdate --install-rosetta --agree-to-license  # for python<=3.8 or x86_64/universal2 tests
-            pip3 install cibuildwheel==2.23.0
+            pip3 install cibuildwheel==2.23.1
            cibuildwheel --output-dir wheelhouse
      - store_artifacts:
          path: wheelhouse/
@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
  install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.23.0
+    - python -m pip install cibuildwheel==2.23.1
  run_cibuildwheel_script:
    - cibuildwheel
  wheels_artifacts:
@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
  install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.23.0
+    - python -m pip install cibuildwheel==2.23.1
  run_cibuildwheel_script:
    - cibuildwheel
  wheels_artifacts:
@@ -44,7 +44,7 @@ jobs:
      - uses: actions/checkout@v4
      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.23.0
+        uses: pypa/cibuildwheel@v2.23.1
        env:
          CIBW_PLATFORM: ${{ matrix.platform }}
          CIBW_ARCHS: ${{ matrix.archs }}
@@ -15,7 +15,7 @@ jobs:
      - uses: actions/checkout@v4
      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.23.0
+        uses: pypa/cibuildwheel@v2.23.1
        # env:
        #   CIBW_SOME_OPTION: value
        #   ...
@@ -21,7 +21,7 @@ jobs:
          platforms: all
      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.23.0
+        uses: pypa/cibuildwheel@v2.23.1
        env:
          # configure cibuildwheel on Linux to build native archs ('auto'),
          # and to split the remaining architectures between the x86_64 and
@@ -12,7 +12,7 @@ linux:
    DOCKER_TLS_CERTDIR: ""
  script:
    - curl -sSL https://get.docker.com/ | sh
-    - python -m pip install cibuildwheel==2.23.0
+    - python -m pip install cibuildwheel==2.23.1
    - cibuildwheel --output-dir wheelhouse
  artifacts:
    paths:
@@ -23,7 +23,7 @@ windows:
  before_script:
    - choco install python -y --version 3.12.4
    - choco install git.install -y
-    - py -m pip install cibuildwheel==2.23.0
+    - py -m pip install cibuildwheel==2.23.1
  script:
    - py -m cibuildwheel --output-dir wheelhouse --platform windows
  artifacts:
@@ -35,7 +35,7 @@ windows:
 macos:
  image: macos-14-xcode-15
  before_script:
-    - python3 -m pip install cibuildwheel==2.23.0
+    - python3 -m pip install cibuildwheel==2.23.1
  script:
    - python3 -m cibuildwheel --output-dir wheelhouse
  artifacts:
@@ -14,7 +14,7 @@ linux:
    - curl -sSL https://get.docker.com/ | sh
    # Warning: This is extremely slow, be careful with how many wheels you build
    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    - python -m pip install cibuildwheel==2.23.0
+    - python -m pip install cibuildwheel==2.23.1
    # Assuming your CI runner's default architecture is x86_64...
    - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64
  artifacts:
@@ -20,7 +20,7 @@ jobs:
        - ln -s /c/Python312/python.exe /c/Python312/python3.exe
 install:
-  - python3 -m pip install cibuildwheel==2.23.0
+  - python3 -m pip install cibuildwheel==2.23.1
 script:
  # build the wheels, put them into './dist'
@@ -26,7 +26,7 @@ jobs:
        - ln -s /c/Python312/python.exe /c/Python312/python3.exe
 install:
-  - python3 -m pip install cibuildwheel==2.23.0
+  - python3 -m pip install cibuildwheel==2.23.1
 script:
  # build the wheels, put them into './wheelhouse'
@@ -52,7 +52,7 @@ jobs:
    - stage: deploy
      name: Build and deploy Linux wheels
      services: docker
-      install: python3 -m pip install cibuildwheel==2.23.0 twine
+      install: python3 -m pip install cibuildwheel==2.23.1 twine
      script: python3 -m cibuildwheel --output-dir wheelhouse
      after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
    # Deploy on windows
@@ -60,7 +60,7 @@ jobs:
      name: Build and deploy Windows wheels
      os: windows
      language: shell
-      install: python3 -m pip install cibuildwheel==2.23.0 twine
+      install: python3 -m pip install cibuildwheel==2.23.1 twine
      script: python3 -m cibuildwheel --output-dir wheelhouse
      after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 [project]
 name = "cibuildwheel"
-version = "2.23.0"
+version = "2.23.1"
 description = "Build Python wheels on CI with minimal configuration."
 readme = "README.md"
 license = "BSD-2-Clause"
@@ -561,4 +561,4 @@ def test_deprecated_image(image: str, deprecated: bool, capsys: pytest.CaptureFi
        assert f"Deprecated image {image!r}" in captured.err
        assert f"{resolved_image!r}" in captured.err
    else:
-        assert captured.err == ""
+        assert "Deprecated image" not in captured.err
`@@ -1 +1 @@`
	`__version__ = "2.23.0"`	`__version__ = "2.23.1"`