From e7c822b513cdf44ab5355d8f2d58665963695e56 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Mon, 7 Nov 2022 09:52:07 +0000 Subject: [PATCH 1/2] uprev pyo3, relax anyio constraint --- Cargo.lock | 30 ++++++++++++++++++++---------- Cargo.toml | 2 +- pyproject.toml | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a1604f..9ac837b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,6 +141,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "mio" version = "0.8.2" @@ -231,13 +240,14 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.16.4" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd86513975ed69bf3fb5d4a286cdcda66dbc56f84bdf4832b6c82b459f4417b2" +checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" dependencies = [ "cfg-if", "indoc", "libc", + "memoffset", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -247,9 +257,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.16.4" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450e2e56cbfa67bbe224cef93312b7a76d81c471d4e0c459d24d4bfaf3d75b53" +checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" dependencies = [ "once_cell", "target-lexicon", @@ -257,9 +267,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.16.4" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e653782972eba2fe86e8319ade54b97822c65fb1ccc1e116368372faa6ebc9" +checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" dependencies = [ "libc", "pyo3-build-config", @@ -267,9 +277,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.16.4" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317ce641f29f4e10e75765630bf4d28b2008612226fcc80b27f334fee8184d0f" +checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -279,9 +289,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.16.4" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59342fce58a05983688e8d81209d06f67f0fcb1597253ef63b390b2da2417522" +checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 4fb7628..2e2395a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ include = [ [dependencies] crossbeam-channel = "0.5.4" notify = "5.0.0" -pyo3 = {version = "0.16.4", features = ["extension-module", "abi3-py37"]} +pyo3 = {version = "0.17.3", features = ["extension-module", "abi3-py37"]} [lib] name = "_rust_notify" diff --git a/pyproject.toml b/pyproject.toml index 2c5f73c..cf923a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ authors = [ {name ='Samuel Colvin', email = 's@muelcolvin.com'}, ] dependencies = [ - 'anyio>=3.0.0,<4', + 'anyio>=3.0.0', ] classifiers = [ 'Development Status :: 5 - Production/Stable', From 2db46edc2c671c900acac6f5b22e630bc3f41a05 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Mon, 7 Nov 2022 10:41:04 +0000 Subject: [PATCH 2/2] switch pytest-sugar -> pytest-pretty --- requirements/testing.in | 2 +- requirements/testing.txt | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/requirements/testing.in b/requirements/testing.in index af1958d..db7f8ef 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -2,5 +2,5 @@ coverage dirty-equals pytest pytest-mock -pytest-sugar +pytest-pretty pytest-timeout diff --git a/requirements/testing.txt b/requirements/testing.txt index dae2d66..ae1e273 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -6,6 +6,8 @@ # attrs==22.1.0 # via pytest +commonmark==0.9.1 + # via rich coverage==6.4.4 # via -r requirements/testing.in dirty-equals==0.5.0 @@ -13,31 +15,31 @@ dirty-equals==0.5.0 iniconfig==1.1.1 # via pytest packaging==21.3 - # via - # pytest - # pytest-sugar + # via pytest pluggy==1.0.0 # via pytest py==1.11.0 # via pytest +pygments==2.13.0 + # via rich pyparsing==3.0.9 # via packaging pytest==7.1.3 # via # -r requirements/testing.in # pytest-mock - # pytest-sugar + # pytest-pretty # pytest-timeout pytest-mock==3.8.2 # via -r requirements/testing.in -pytest-sugar==0.9.5 +pytest-pretty==0.0.1 # via -r requirements/testing.in pytest-timeout==2.1.0 # via -r requirements/testing.in pytz==2022.2.1 # via dirty-equals -termcolor==1.1.0 - # via pytest-sugar +rich==12.6.0 + # via pytest-pretty tomli==2.0.1 # via pytest typing-extensions==4.3.0