From 847ffe563cd33843c9e2d12bb9b86fff4d54a037 Mon Sep 17 00:00:00 2001 From: zhangjingqiang Date: Mon, 21 Mar 2022 08:58:26 +0800 Subject: [PATCH 1/3] allow to compile with parking_lot 0.12 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0c83a75c29b..6b66c39d32d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ edition = "2018" [dependencies] cfg-if = "1.0" libc = "0.2.62" -parking_lot = "0.11.0" +parking_lot = ">= 0.11, < 0.13" # ffi bindings to the python interpreter, split into a seperate crate so they can be used independently pyo3-ffi = { path = "pyo3-ffi", version = "=0.16.2" } From 0aead58fcd88d6e92c7d0f7e0a228022bbac1165 Mon Sep 17 00:00:00 2001 From: messense Date: Mon, 21 Mar 2022 11:23:27 +0800 Subject: [PATCH 2/3] Fix minimal package version for parking_lot --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0cd74a7c6..4a127175a24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,8 +175,13 @@ jobs: - if: matrix.msrv == 'MSRV' name: Prepare minimal package versions (MSRV only) run: | + set -x cargo update -p indexmap --precise 1.6.2 cargo update -p hashbrown:0.12.0 --precise 0.9.1 + PROJECTS=("." "examples/decorator" "examples/maturin-starter" "examples/setuptools-rust-starter" "examples/word-count") + for PROJ in ${PROJECTS[@]}; do + cargo update --manifest-path "$PROJ/Cargo.toml" -p parking_lot --precise 0.11.0 + done - name: Build docs run: cargo doc --no-deps --no-default-features --features "full ${{ matrix.extra_features }}" From ad8ffaad2e25f2266cb77004bfbf9fccdec06028 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 22 Mar 2022 13:51:58 +0800 Subject: [PATCH 3/3] Update changelog for parking_lot supported versions --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e56e57d2192..0fcd857aa68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `as_bytes` on `Py`. [#2235](https://github.com/PyO3/pyo3/pull/2235) +### Packaging + +- Extend `parking_lot` dependency supported versions to include 0.12. [#2239](https://github.com/PyO3/pyo3/pull/2239) + ## [0.16.2] - 2022-03-15 ### Packaging