vertexes -> vertices

plural/__init__.py

@@ -21,13 +21,13 @@
 from plural.store import serialize_commit
 from plural.store import PluralStore
 from plural.models.edges import Edge
-from plural.models.vertexes import Vertex
-from plural.models.vertexes import IncomingVertex
-from plural.models.vertexes import OutgoingVertex
-from plural.models.vertexes import IndirectVertex
-from plural.models.meta.vertexes import incoming_vertex
-from plural.models.meta.vertexes import outgoing_vertex
-from plural.models.meta.vertexes import indirect_vertex
+from plural.models.vertices import Vertex
+from plural.models.vertices import IncomingVertex
+from plural.models.vertices import OutgoingVertex
+from plural.models.vertices import IndirectVertex
+from plural.models.meta.vertices import incoming_vertex
+from plural.models.meta.vertices import outgoing_vertex
+from plural.models.meta.vertices import indirect_vertex
 from plural.exceptions import EdgeDefinitionNotFound
 from plural.exceptions import InvalidEdgeDefinition
 

plural/models/meta/edges.py

@@ -18,7 +18,7 @@
 
 from collections import defaultdict
 from collections import OrderedDict
-from plural.models.meta.vertexes import VertexFactory
+from plural.models.meta.vertices import VertexFactory
 from plural.models.element import Element
 from plural.exceptions import InvalidEdgeDefinition
 

plural/models/meta/vertexes.py → plural/models/meta/vertices.py

@@ -53,16 +53,16 @@ def __init__(cls, name, bases, members):
         indexes = set()
         codecs = {}
 
-        if name == 'Vertex':  # and cls.__module__.startswith('plural.models.vertexes'):
+        if name == 'Vertex':  # and cls.__module__.startswith('plural.models.vertices'):
             MetaVertex.Target = cls
             super(MetaVertex, cls).__init__(name, bases, members)
             return
 
-        if name == 'MetaVertex':  # and cls.__module__.startswith('plural.models.vertexes'):
+        if name == 'MetaVertex':  # and cls.__module__.startswith('plural.models.vertices'):
             super(MetaVertex, cls).__init__(name, bases, members)
             return
 
-        if name not in ('MetaVertex', 'Vertex') and not cls.__module__.startswith('plural.models.vertexes'):
+        if name not in ('MetaVertex', 'Vertex') and not cls.__module__.startswith('plural.models.vertices'):
             VERTEXES[name] = cls
             VERTEXES_BY_CLASS[cls] = name
             indexes = validate_vertex_definition(name, cls, members)

plural/models/vertexes.py → plural/models/vertices.py

@@ -15,9 +15,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from plural.models.meta.vertexes import MetaVertex
-from plural.models.meta.vertexes import VERTEXES
-from plural.models.meta.vertexes import is_vertex_subclass
+from plural.models.meta.vertices import MetaVertex
+from plural.models.meta.vertices import VERTEXES
+from plural.models.meta.vertices import is_vertex_subclass
 from plural.models.element import Element
 
 from plural.exceptions import VertexDefinitionNotFound

plural/store.py

@@ -27,13 +27,13 @@
 from pygit2 import IndexEntry
 from pygit2 import Signature
 from plural.models.meta.edges import edge_has_index
-from plural.models.meta.vertexes import vertex_has_index
+from plural.models.meta.vertices import vertex_has_index
 from plural.models.meta.edges import is_edge_subclass
-from plural.models.meta.vertexes import is_vertex_subclass
+from plural.models.meta.vertices import is_vertex_subclass
 from plural.models.edges import Edge
-from plural.models.vertexes import Vertex
+from plural.models.vertices import Vertex
 from plural.models.edges import resolve_edge_name
-from plural.models.vertexes import resolve_vertex_name
+from plural.models.vertices import resolve_vertex_name
 from plural.util import generate_uuid
 from plural.util import serialize_commit
 from plural.util import AutoCodec

tests/edges.py

@@ -18,14 +18,14 @@
 from plural import Edge
 from plural import codec
 
-from tests.vertexes import AuthoredDocument
-from tests.vertexes import TaggedDocument
-from tests.vertexes import CarPurchase
-from tests.vertexes import CarSale
-from tests.vertexes import CarDeal
-from plural.models.meta.vertexes import outgoing_vertex
-from plural.models.meta.vertexes import indirect_vertex
-from plural.models.meta.vertexes import incoming_vertex
+from tests.vertices import AuthoredDocument
+from tests.vertices import TaggedDocument
+from tests.vertices import CarPurchase
+from tests.vertices import CarSale
+from tests.vertices import CarDeal
+from plural.models.meta.vertices import outgoing_vertex
+from plural.models.meta.vertices import indirect_vertex
+from plural.models.meta.vertices import incoming_vertex
 
 
 class Vehicle(Edge):
@@ -58,7 +58,7 @@ class Car(Vehicle):
         'metadata': codec.JSON,
     }
 
-    vertexes = [
+    vertices = [
         incoming_vertex('sold_by', 'Person').through(CarSale),
         outgoing_vertex('bought_by', 'Person').through(CarPurchase),
         indirect_vertex('deal', 'Car').through(CarDeal),
@@ -85,7 +85,7 @@ class Document(Edge):
         'title': codec.Unicode,
     }
 
-    vertexes = [
+    vertices = [
         incoming_vertex('authored_by', Author).through(AuthoredDocument),
         outgoing_vertex('tagged_by', Tag).through(TaggedDocument),
     ]

tests/functional/test_vertexes.py → tests/functional/test_vertices.py

@@ -3,8 +3,8 @@
 from decimal import Decimal
 from tests.functional.scenarios import with_hexastore
 from tests.edges import Car, Person
-from tests.vertexes import CarPurchase
-from tests.vertexes import CarSale
+from tests.vertices import CarPurchase
+from tests.vertices import CarSale
 
 
 @with_hexastore('vehicles')

tests/unit/test_store.py

@@ -21,8 +21,8 @@
 from plural.store import PluralStore
 from tests.edges import Car
 from tests.edges import Person
-from tests.vertexes import CarPurchase
-from tests.vertexes import CarSale
+from tests.vertices import CarPurchase
+from tests.vertices import CarSale
 from .scenarios import with_graph_store