Skip to content

Bump PyO3 and rust-numpy to latest 0.29 release #1603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IvanIsCoding merged 1 commit into from
Jun 16, 2026
Merged

Bump PyO3 and rust-numpy to latest 0.29 release #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 13 additions & 46 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ indexmap = { version = ">=1.9, <3", features = ["rayon"] }
ndarray = { version = "0.16.1", features = ["rayon"] }
num-traits = "0.2"
petgraph = "0.8"
numpy = "0.26"
numpy = "0.29"
rand = "0.9"
rand_distr = "0.5"
rand_pcg = "0.9"
Expand Down Expand Up @@ -71,7 +71,7 @@ version = "0.15" # Implicitly required to match PyO3's and `petgraph`'s via cro
features = ["rayon"]

[dependencies.pyo3]
version = "0.26"
version = "0.29"
features = ["abi3-py310", "extension-module", "hashbrown", "num-bigint", "num-complex", "indexmap", "py-clone"]

[dependencies.sprs]
Expand Down
2 changes: 1 addition & 1 deletion src/coloring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub use rustworkx_core::coloring::ColoringStrategy as ColoringStrategyCore;
/// - `GIS` strategy in [1] (section 1.2.2.9)
///
/// [1] Adrian Kosowski, and Krzysztof Manuszewski, Classical Coloring of Graphs, Graph Colorings, 2-19, 2004. ISBN 0-8218-3458-4.
#[pyclass(module = "rustworkx", eq, eq_int)]
#[pyclass(module = "rustworkx", eq, eq_int, from_py_object)]
#[derive(Clone, PartialEq)]
pub enum ColoringStrategy {
Degree,
Expand Down
5 changes: 3 additions & 2 deletions src/connectivity/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,8 +1025,9 @@ pub enum TargetNodes {
Multiple(HashSet<NodeIndex>),
}

impl<'py> FromPyObject<'py> for TargetNodes {
fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
impl<'py> FromPyObject<'_, 'py> for TargetNodes {
type Error = PyErr;
fn extract(ob: Borrowed<'_, 'py, PyAny>) -> PyResult<Self> {
if let Ok(int) = ob.extract::<usize>() {
Ok(Self::Single(NodeIndex::new(int)))
} else {
Expand Down
38 changes: 21 additions & 17 deletions src/digraph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use smallvec::SmallVec;
use pyo3::IntoPyObjectExt;
use pyo3::PyTraverseError;
use pyo3::Python;
use pyo3::exceptions::PyIndexError;
use pyo3::exceptions::{PyIndexError, PyUnicodeDecodeError};
use pyo3::gc::PyVisit;
use pyo3::prelude::*;
use pyo3::types::{IntoPyDict, PyBool, PyDict, PyGenericAlias, PyList, PyString, PyTuple, PyType};
Expand Down Expand Up @@ -187,7 +187,7 @@ use super::dag_algo::is_directed_acyclic_graph;
/// many edges before needing to grow. This does not prepopulate any edges with data, it is
/// only a potential performance optimization if the complete size of the graph is known in
/// advance.
#[pyclass(mapping, module = "rustworkx", subclass)]
#[pyclass(mapping, module = "rustworkx", subclass, from_py_object)]
#[derive(Clone)]
pub struct PyDiGraph {
pub graph: StablePyGraph<Directed>,
Expand Down Expand Up @@ -367,17 +367,17 @@ impl PyDiGraph {
}

fn __setstate__(&mut self, py: Python, state: Py<PyAny>) -> PyResult<()> {
let dict_state = state.downcast_bound::<PyDict>(py)?;
let dict_state = state.bind(py).cast::<PyDict>()?;
let binding = dict_state.get_item("nodes")?.unwrap();
let nodes_lst = binding.downcast::<PyList>()?;
let nodes_lst = binding.cast::<PyList>()?;
let binding = dict_state.get_item("edges")?.unwrap();
let edges_lst = binding.downcast::<PyList>()?;
let edges_lst = binding.cast::<PyList>()?;
self.graph = StablePyGraph::<Directed>::new();
let dict_state = state.downcast_bound::<PyDict>(py)?;
let dict_state = state.bind(py).cast::<PyDict>()?;
self.node_removed = dict_state
.get_item("nodes_removed")?
.unwrap()
.downcast::<PyBool>()?
.cast::<PyBool>()?
.extract()?;

// graph is empty, stop early
Expand All @@ -388,7 +388,7 @@ impl PyDiGraph {
if !self.node_removed {
for item in nodes_lst.iter() {
let node_w = item
.downcast::<PyTuple>()
.cast::<PyTuple>()
.unwrap()
.get_item(1)
.unwrap()
Expand All @@ -399,7 +399,7 @@ impl PyDiGraph {
} else if nodes_lst.len() == 1 {
// graph has only one node, handle logic here to save one if in the loop later
let binding = nodes_lst.get_item(0).unwrap();
let item = binding.downcast::<PyTuple>().unwrap();
let item = binding.cast::<PyTuple>().unwrap();
let node_idx: usize = item.get_item(0).unwrap().extract().unwrap();
let node_w = item.get_item(1).unwrap().extract().unwrap();

Expand All @@ -412,15 +412,15 @@ impl PyDiGraph {
}
} else {
let binding = nodes_lst.get_item(nodes_lst.len() - 1).unwrap();
let last_item = binding.downcast::<PyTuple>().unwrap();
let last_item = binding.cast::<PyTuple>().unwrap();

// list of temporary nodes that will be removed later to re-create holes
let node_bound_1: usize = last_item.get_item(0).unwrap().extract().unwrap();
let mut tmp_nodes: Vec<NodeIndex> =
Vec::with_capacity(node_bound_1 + 1 - nodes_lst.len());

for item in nodes_lst {
let item = item.downcast::<PyTuple>().unwrap();
let item = item.cast::<PyTuple>().unwrap();
let next_index: usize = item.get_item(0).unwrap().extract().unwrap();
let weight: Py<PyAny> = item.get_item(1).unwrap().extract().unwrap();
while next_index > self.graph.node_bound() {
Expand All @@ -445,7 +445,7 @@ impl PyDiGraph {
// add a temporary edge that will be deleted later to re-create the hole
self.graph.add_edge(tmp_node, tmp_node, py.None());
} else {
let triple = item.downcast::<PyTuple>().unwrap();
let triple = item.cast::<PyTuple>().unwrap();
let edge_p: usize = triple.get_item(0).unwrap().extract().unwrap();
let edge_c: usize = triple.get_item(1).unwrap().extract().unwrap();
let edge_w = triple.get_item(2).unwrap().extract().unwrap();
Expand Down Expand Up @@ -1275,7 +1275,7 @@ impl PyDiGraph {
edge.weight().clone_ref(py)
};
if let Some(edge_data) = in_edges.get_item(key_value.bind(py))? {
let edge_data = edge_data.downcast::<RemoveNodeEdgeValue>()?;
let edge_data = edge_data.cast::<RemoveNodeEdgeValue>()?;
edge_data.borrow_mut().nodes.push(edge.source());
} else {
in_edges.set_item(
Expand All @@ -1302,7 +1302,7 @@ impl PyDiGraph {
edge.weight().clone_ref(py)
};
if let Some(edge_data) = out_edges.get_item(key_value.bind(py))? {
let edge_data = edge_data.downcast::<RemoveNodeEdgeValue>()?;
let edge_data = edge_data.cast::<RemoveNodeEdgeValue>()?;
edge_data.borrow_mut().nodes.push(edge.target());
} else {
out_edges.set_item(
Expand All @@ -1319,9 +1319,9 @@ impl PyDiGraph {
};

for (in_key, in_edge_data) in in_edges {
let in_edge_data = in_edge_data.downcast::<RemoveNodeEdgeValue>()?.borrow();
let in_edge_data = in_edge_data.cast::<RemoveNodeEdgeValue>()?.borrow();
let out_edge_data = match out_edges.get_item(in_key)? {
Some(out_edge_data) => out_edge_data.downcast::<RemoveNodeEdgeValue>()?.borrow(),
Some(out_edge_data) => out_edge_data.cast::<RemoveNodeEdgeValue>()?.borrow(),
None => continue,
};
for source in in_edge_data.nodes.iter() {
Expand Down Expand Up @@ -2447,7 +2447,11 @@ impl PyDiGraph {
None => {
let mut file = Vec::<u8>::new();
build_dot(py, &self.graph, &mut file, graph_attr, node_attr, edge_attr)?;
Ok(Some(PyString::new(py, str::from_utf8(&file)?)))
Ok(Some(PyString::new(
py,
str::from_utf8(&file)
.map_err(|e| PyUnicodeDecodeError::new_err_from_utf8(py, &file, e))?,
)))
}
}
}
Expand Down
Loading
Loading