small fixes

Author: tomvanmele

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* Merged `compas.datastructures.Graph` into `compas.datastructures.Network`.
+* Merged `compas.datastructures.Network` into `compas.datastructures.Graph`.
 
 ### Removed
 

src/compas/datastructures/graph/graph.py

@@ -196,7 +196,7 @@ def from_edges(cls, edges):
 
         See Also
         --------
-        :meth:`from_graphx`
+        :meth:`from_networkx`
 
         """
         graph = cls()

tests/compas/data/test_dataschema.py

@@ -618,7 +618,7 @@ def test_schema_pointcloud_invalid(pointcloud):
             },
         ],
     )
-    def test_schema_graphalid(graph):
+    def test_schema_graph_valid(graph):
         Graph.validate_data(graph)
 
     @pytest.mark.parametrize(

tests/compas/datastructures/test_network.py renamed to tests/compas/datastructures/test_graph.py

@@ -209,7 +209,7 @@ def test_graph_default_edge_attributes():
 # ==============================================================================
 
 
-def test_network_to_networkx():
+def test_graph_to_networkx():
     if compas.IPY:
         return