diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21f8d3c89..e4b134148 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -154,7 +154,7 @@ jobs: if: runner.os == 'Linux' - name: 'Build rustworkx and test dependencies' run: | - pip install -c constraints.txt -U '.[mpl,graphviz]' fixtures testtools>=2.5.0 networkx>=2.5 stestr + pip install -c constraints.txt -U '.[mpl,graphviz]' fixtures testtools>=2.5.0 networkx>=2.5 stestr>=4.1 - name: 'Build retworkx' env: RUSTWORKX_PKG_NAME: "retworkx" diff --git a/Cargo.lock b/Cargo.lock index 060c5b061..36b79a054 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,16 +58,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -557,9 +547,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -578,14 +568,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1b230dd49..eed872da0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ numpy = "0.19.0" petgraph = "0.6.4" rand = "0.8" rand_pcg = "0.3" -rayon = "1.7" +rayon = "1.8" rayon-cond = "1.7" [lib] diff --git a/noxfile.py b/noxfile.py index 2f4a460ca..eee803f57 100644 --- a/noxfile.py +++ b/noxfile.py @@ -9,7 +9,7 @@ "testtools>=2.5.0", "networkx>=2.5", "scipy>=1.7", - "stestr", + "stestr>=4.1", ] lint_deps = [