Merge branch 'master' into pyclass-unsendable

PyO3 · Jun 30, 2020 · 5123351 · 5123351
2 parents d76fe78 + 51bff2b
commit 5123351
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - `#[pyclass(unsendable)]`. [#1009](https://github.com/PyO3/pyo3/pull/1009)
 
+### Changed
+- Update `parking_lot` dependency to `0.11`. [#1010](https://github.com/PyO3/pyo3/pull/1010)
+
 ## [0.11.0] - 2020-06-28
 ### Added
 - Support stable versions of Rust (>=1.39). [#969](https://github.com/PyO3/pyo3/pull/969)

diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ ctor = { version = "0.1", optional = true }
 indoc = { version = "0.3.4", optional = true }
 inventory = { version = "0.1.4", optional = true }
 libc = "0.2.62"
-parking_lot = "0.10.2"
+parking_lot = "0.11.0"
 num-bigint = { version = "0.3", optional = true }
 num-complex = { version = "0.3", optional = true }
 paste = { version = "0.1.6", optional = true }

diff --git a/Makefile b/Makefile
@@ -7,7 +7,6 @@ test: lint test_py
 	cargo test
 
 test_py:
-	tox -e py
 	for example in examples/*; do tox -e py -c $$example/tox.ini || exit 1; done
 
 fmt: