Merge pull request #2265 from PyO3/konsti/bump-1.7.5

Prepare 1.7.5 release
PyO3 · Oct 18, 2024 · 3fea058 · 3fea058
2 parents 540299f + 585e30d
commit 3fea058
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -178,37 +178,38 @@ jobs:
         run: echo "RUSTFLAGS="-C debuginfo=0"" >> $GITHUB_ENV
       - name: cargo test
         run: cargo nextest run --features password-storage
-      - name: test cross compiling with zig
-        if: ${{ !contains(matrix.platform.python-version, '-dev') }}
-        shell: bash
-        run: |
-          set -ex
-          rustup target add aarch64-unknown-linux-gnu
-          rustup target add aarch64-unknown-linux-musl
-          rustup target add aarch64-apple-darwin
-
-          # abi3
-          cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-unknown-linux-gnu --zig
-          cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-unknown-linux-musl --zig
-          if [[ "$PYTHON_VERSION" != "pypy"* ]]; then
-            cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-apple-darwin --zig
-          fi
-
-          if [[ "$PYTHON_VERSION" == "3.1"* ]]; then
-            # Check abi3 wheels with abi3audit on CPython only
-            pip install abi3audit
-            abi3audit test-crates/pyo3-pure/target/wheels/*.whl
-          fi
-          # Check wheels with twine
-          twine check --strict test-crates/pyo3-pure/target/wheels/*.whl
-
-          # non-abi3
-          cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-mixed/Cargo.toml --target aarch64-unknown-linux-gnu --zig
-          if [[ "$PYTHON_VERSION" != "pypy"* ]]; then
-            cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-mixed/Cargo.toml --target aarch64-apple-darwin --zig
-          fi
-          # Check wheels with twine
-          twine check --strict test-crates/pyo3-mixed/target/wheels/*.whl
+      # TODO: https://github.com/PyO3/maturin/issues/2263
+      #- name: test cross compiling with zig
+      #  if: ${{ !contains(matrix.platform.python-version, '-dev') }}
+      #  shell: bash
+      #  run: |
+      #    set -ex
+      #    rustup target add aarch64-unknown-linux-gnu
+      #    rustup target add aarch64-unknown-linux-musl
+      #    rustup target add aarch64-apple-darwin
+      #
+      #    # abi3
+      #    cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-unknown-linux-gnu --zig
+      #    cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-unknown-linux-musl --zig
+      #    if [[ "$PYTHON_VERSION" != "pypy"* ]]; then
+      #      cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-pure/Cargo.toml --target aarch64-apple-darwin --zig
+      #    fi
+      #
+      #    if [[ "$PYTHON_VERSION" == "3.1"* ]]; then
+      #      # Check abi3 wheels with abi3audit on CPython only
+      #      pip install abi3audit
+      #      abi3audit test-crates/pyo3-pure/target/wheels/*.whl
+      #    fi
+      #    # Check wheels with twine
+      #    twine check --strict test-crates/pyo3-pure/target/wheels/*.whl
+      #
+      #    # non-abi3
+      #    cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-mixed/Cargo.toml --target aarch64-unknown-linux-gnu --zig
+      #    if [[ "$PYTHON_VERSION" != "pypy"* ]]; then
+      #      cargo run -- build -i $PYTHON_VERSION -m test-crates/pyo3-mixed/Cargo.toml --target aarch64-apple-darwin --zig
+      #    fi
+      #    # Check wheels with twine
+      #    twine check --strict test-crates/pyo3-mixed/target/wheels/*.whl
       - name: test compiling with PYO3_CONFIG_FILE
         shell: bash
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <[email protected]>", "messense <[email protected]>"]
 name = "maturin"
-version = "1.7.4"
+version = "1.7.5"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",

diff --git a/Changelog.md b/Changelog.md
@@ -1,8 +1,9 @@
 # Changelog
 
-## [Unreleased]
+## [1.7.5]
 
 * Improve wheel reproducibility by sorting external libraries [#2261](https://github.com/PyO3/maturin/pull/2261)
+* Fix Readme and pyproject.toml inclusions for workspace where the bindings crate is not in the root in [#2262](https://github.com/PyO3/maturin/pull/2262)
 
 ## [1.7.4]