Minor improvements: prevent future test failures, remove fixtures, and more (#1446)

* Fix typo (makes nox -elint happy)

* Prevent tests from failing with Networkx 3.6

* Pin ruff

* Use try/except to support Python 3.9

Author: IvanIsCoding

pyproject.toml

@@ -73,14 +73,13 @@ testinfra = [
 ]
 test = [
   "setuptools-rust",
-  "fixtures",
   "testtools>=2.5.0",
-  "networkx>=2.5",
+  "networkx>=3.2",
   "stestr>=4.1",
 ]
 lint = [
     "black~=24.8",
-    "ruff~=0.6",
+    "ruff==0.11.9",
     "setuptools-rust",
     "typos~=1.28",
 ]
@@ -108,7 +107,7 @@ releaseinfra = [
 
 [tool.black]
 line-length = 100
-target-version = ['py39', 'py310', 'py311', 'py312']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 
 [tool.ruff]
 line-length = 105 # more lenient than black due to long function signatures

rustworkx-core/src/generators/random_graph.rs

@@ -41,7 +41,7 @@ use super::InvalidInputError;
 ///
 /// Raises an error if
 ///
-/// This algorithm is based on the implementation of networkx functon
+/// This algorithm is based on the implementation of networkx function
 /// <https://github.com/networkx/networkx/blob/networkx-2.4/networkx/generators/random_graphs.py>
 ///
 /// A. Steger and N. Wormald,

tests/digraph/test_node_link_json.py

@@ -174,7 +174,11 @@ def test_round_trip_file(self):
 
     def test_round_trip_networkx(self):
         graph = nx.generators.path_graph(5, create_using=nx.DiGraph)
-        node_link_str = json.dumps(nx.node_link_data(graph))
+        try:
+            node_link_str = json.dumps(nx.node_link_data(graph, edges="links"))
+        except TypeError:
+            # TODO: Remove this once we no longer need to support Python 3.9
+            node_link_str = json.dumps(nx.node_link_data(graph))
         new = rustworkx.parse_node_link_json(node_link_str)
         self.assertIsInstance(new, rustworkx.PyDiGraph)
         self.assertEqual(new.num_nodes(), graph.number_of_nodes())

tests/graph/test_node_link_json.py

@@ -174,7 +174,11 @@ def test_round_trip_with_file(self):
 
     def test_round_trip_networkx(self):
         graph = nx.generators.path_graph(5)
-        node_link_str = json.dumps(nx.node_link_data(graph))
+        try:
+            node_link_str = json.dumps(nx.node_link_data(graph, edges="links"))
+        except TypeError:
+            # TODO: Remove this once we no longer need to support Python 3.9
+            node_link_str = json.dumps(nx.node_link_data(graph))
         new = rustworkx.parse_node_link_json(node_link_str)
         self.assertIsInstance(new, rustworkx.PyGraph)
         self.assertEqual(new.num_nodes(), graph.number_of_nodes())