Merge pull request #344 from adamnsch/nx-typo

Fix typo in tox.ini

Author: adamnsch

graphdatascience/tests/integration/test_nx_loader.py

@@ -56,6 +56,7 @@ def test_undirected_nx(gds: GraphDataScience, undirected_nx_G: nx.Graph) -> None
     G.drop()
 
 
+@pytest.mark.filterwarnings("ignore: GDS Enterprise users can use Apache Arrow")
 @pytest.mark.compatible_with(min_inclusive=ServerVersion(2, 1, 0))
 def test_undirected_nx_without_Arrow(gds_without_arrow: GraphDataScience, undirected_nx_G: nx.Graph) -> None:
     G = gds_without_arrow.graph.networkx.load(undirected_nx_G, GRAPH_NAME)
@@ -92,6 +93,7 @@ def test_directed_nx(gds: GraphDataScience, directed_nx_G: nx.Graph) -> None:
     G.drop()
 
 
+@pytest.mark.filterwarnings("ignore: GDS Enterprise users can use Apache Arrow")
 @pytest.mark.compatible_with(min_inclusive=ServerVersion(2, 1, 0))
 def test_directed_nx_without_Arrow(gds_without_arrow: GraphDataScience, directed_nx_G: nx.Graph) -> None:
     G = gds_without_arrow.graph.networkx.load(directed_nx_G, GRAPH_NAME)

graphdatascience/tests/unit/test_nx_loader.py

@@ -111,7 +111,7 @@ def test_parse_inconsistent_rel_props(gds: GraphDataScience) -> None:
 
     assert len(rels) == 1
     assert_frame_equal(
-        rels[0],
+        rels[0].sort_index(axis=1),
         DataFrame(
             {
                 "relationshipType": ["R"] * 2,
@@ -120,7 +120,7 @@ def test_parse_inconsistent_rel_props(gds: GraphDataScience) -> None:
                 "weight": [0.4, None],
                 "weight2": [None, 1.4],
             }
-        ),
+        ).sort_index(axis=1),
     )
 
 

requirements/base/networkx.txt

@@ -1 +1 @@
-networkx >= 2.0, < 3.0
+networkx >= 2.0, < 4.0

tox.ini

@@ -40,8 +40,8 @@ deps =
 	pyarrow9: pyarrow >= 9.0, < 10.0
 	pyarrow10: pyarrow >= 10.0, < 11.0
 	pyarrow11: pyarrow >= 11.0, < 12.0
-	networkx2: network >= 2.0, < 3.0
-	networkx3: network >= 3.0, < 4.0
+	networkx2: networkx >= 2.0, < 3.0
+	networkx3: networkx >= 3.0, < 4.0
 commands =
 	standard: bash -ec 'pytest graphdatascience/tests --include-enterprise --include-model-store-location -Werror && ruby ./doc/tests/test_docs.rb python3 -n test_enterprise'
 	encrypted: pytest graphdatascience/tests --encrypted-only -Werror