Skip to content

Commit

Permalink
Switch from Python 3.11rc to official release (backport #714) (#727)
Browse files Browse the repository at this point in the history
* 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 <mtreinish@kortar.org>
Co-authored-by: Ivan Carvalho <8753214+IvanIsCoding@users.noreply.github.com>
Co-authored-by: Ivan Carvalho <ivancarv@student.ubc.ca>
  • Loading branch information
4 people committed Nov 4, 2022
1 parent cfe072c commit 4a483af
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
3 changes: 3 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/shortest_path/num_shortest_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
25 changes: 4 additions & 21 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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
Expand Down

0 comments on commit 4a483af

Please sign in to comment.