Switch from Python 3.11rc to official release (backport #714) (#727)

* Fix clippy error with new Rust 1.65 release (#725) Rust 1.65 was recently released which added some new clippy rules. This commit fixes the failure reported when running clippy with 1.65. This would have caused a CI failure as we start using the new rust version in CI. (cherry picked from commit 9ce8d4d) * Switch from Python 3.11rc to official release (#714) * Switch from Python 3.11rc to official release * Move extras to root testenv (cherry picked from commit cd1934d) Co-authored-by: Matthew Treinish <[email protected]> Co-authored-by: Ivan Carvalho <[email protected]> Co-authored-by: Ivan Carvalho <[email protected]>
Qiskit · Nov 4, 2022 · 4a483af · 4a483af
1 parent cfe072c
commit 4a483af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -57,7 +57,7 @@ jobs:
     strategy:
       matrix:
         rust: [stable]
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11.0-rc.2"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
         platform: [
           { os: "macOS-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
           { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },

diff --git a/.mergify.yml b/.mergify.yml
@@ -13,6 +13,9 @@ queue_rules:
       - check-success=python3.10-x64 windows-latest
       - check-success=python3.10-x64 ubuntu-latest
       - check-success=python3.10-x64 macOS-latest
+      - check-success=python3.11-x64 windows-latest
+      - check-success=python3.11-x64 ubuntu-latest
+      - check-success=python3.11-x64 macOS-latest
       - check-success=Build, rustfmt, and python lint
       - check-success=Coverage
       - check-success=Build Docs

diff --git a/src/shortest_path/num_shortest_path.rs b/src/shortest_path/num_shortest_path.rs
@@ -35,7 +35,7 @@ pub fn num_shortest_paths_unweighted<Ty: EdgeType>(
             source
         )));
     }
-    let mut bfs = Bfs::new(&graph, node_index);
+    let mut bfs = Bfs::new(graph, node_index);
     let mut distance: Vec<Option<usize>> = vec![None; graph.node_bound()];
     distance[node_index.index()] = Some(0);
     out_map[source] = 1.to_biguint().unwrap();

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.1
-envlist = py36, py37, py38, py39, py310, lint
+envlist = py37, py38, py39, py310, py311, lint
 isolated_build = true
 
 [testenv]
@@ -16,31 +16,14 @@ deps =
   testtools>=2.5.0
   networkx>=2.5
   stestr
+extras =
+  mpl
+  graphviz
 passenv = RETWORKX_TEST_PRESERVE_IMAGES RUSTWORKX_PKG_NAME
 changedir = {toxinidir}/tests
 commands =
   stestr run {posargs}
 
-[testenv:py36]
-extras =
-  mpl
-  graphviz
-
-[testenv:py37]
-extras =
-  mpl
-  graphviz
-
-[testenv:py38]
-extras =
-  mpl
-  graphviz
-
-[testenv:py39]
-extras =
-  mpl
-  graphviz
-
 [testenv:lint]
 basepython = python3
 envdir = .tox/lint