Merge pull request networkx#61 from Lamaun/master

Now runs with networkx v2.4

Author: dschult

.travis.yml

@@ -3,11 +3,9 @@ sudo: false  # Now the build will be running on the new container based platform
 language: python
 
 python:
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
-  - "pypy"
+  - 3.6
+  - 3.7
+  - 3.8
   - "pypy3"
 
 cache:

nxmetis/__init__.py

@@ -127,7 +127,7 @@ def node_nested_dissection(G, weight='weight', options=None):
     if len(G) == 0:
         return []
 
-    vwgt = [G.node[u].get(weight, 1) for u in G]
+    vwgt = [G.nodes[u].get(weight, 1) for u in G]
     if all(w == 1 for w in vwgt):
         vwgt = None
 
@@ -227,11 +227,11 @@ def partition(G, nparts, node_weight='weight', node_size='size',
 
     xadj, adjncy = _convert_graph(G)
 
-    vwgt = [G.node[u].get(node_weight, 1) for u in G]
+    vwgt = [G.nodes[u].get(node_weight, 1) for u in G]
     if all(w == 1 for w in vwgt):
         vwgt = None
 
-    vsize = [G.node[u].get(node_size, 1) for u in G]
+    vsize = [G.nodes[u].get(node_size, 1) for u in G]
     if all(w == 1 for w in vsize):
         vsize = None
 
@@ -298,7 +298,7 @@ def vertex_separator(G, weight='weight', options=None):
     if len(G) == 0:
         return [], [], []
 
-    vwgt = [G.node[u].get(weight, 1) for u in G]
+    vwgt = [G.nodes[u].get(weight, 1) for u in G]
     if all(w == 1 for w in vwgt):
         vwgt = None
 

nxmetis/tests/test_metis.py

@@ -24,7 +24,7 @@ def setUp(self):
         self.node_list = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
                           1, 2, 3, 4, 5, 6]
         self.G = nx.Graph()
-        self.G.add_path(self.node_list)
+        nx.add_path(self.G,self.node_list)
         self.G.add_edge(self.node_list[-1], self.node_list[0])
 
     def test_node_nested_dissection_unweighted(self):