Merge remote-tracking branch 'upstream/main' into new_graph_digraph_m…

…ethods
Qiskit · Sep 22, 2023 · d2d7625 · d2d7625
2 parents c9292b7 + 5ca75ba
commit d2d7625
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git 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
diff --git 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/tox.ini b/tox.ini
@@ -17,7 +17,7 @@ deps =
   testtools>=2.5.0
   networkx>=2.5
   scipy>=1.7
-  stestr
+  stestr>=4.1
 extras =
   mpl
   graphviz