Merge pull request #8 from JuliaGraphs/sbromberger/1.0

nickeubank · web-flow · commit 075ec637cb8c · 2018-09-30T19:44:36.000-05:00
works on Julia 0.7
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
   - linux
 #  - osx
 julia:
-  - 0.6
+  - 1.0
   - nightly
 notifications:
   email: false
diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,5 @@
-julia 0.6
-LightGraphs 0.11
-MetaGraphs 0.2
-DataFrames 0.11
+julia 0.7
+LightGraphs 1.0
+DataFrames 0.13
+MetaGraphs
+
diff --git a/src/GraphDataFrameBridge.jl b/src/GraphDataFrameBridge.jl
@@ -1,7 +1,6 @@
 module GraphDataFrameBridge
 using LightGraphs
 using MetaGraphs
-using JLD2
 using DataFrames
 export MetaGraph, MetaDiGraph
 
@@ -94,7 +93,7 @@ function metagraph_from_dataframe(graph_type,
     sort!(nodes)
 
     vertex_names = DataFrame(Dict(:name => nodes))
-    vertex_names[:vertex_id] = 1:nrow(vertex_names)
+    vertex_names[:vertex_id] = Base.OneTo(nrow(vertex_names))
 
     # Merge in to original
     for c in [origin, destination]
diff --git a/test/graphdataframebridge.jl b/test/graphdataframebridge.jl
@@ -1,5 +1,3 @@
-importall GraphDataFrameBridge
-
 @testset "GraphDataFrameBridge" begin
 
     # Test data from constructor
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,7 +1,8 @@
 using LightGraphs
 using MetaGraphs
 using DataFrames
-using Base.Test
+using GraphDataFrameBridge
+using Test
 
 import LightGraphs.SimpleGraphs: SimpleGraph, SimpleDiGraph
 testdir = dirname(@__FILE__)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-importall GraphDataFrameBridge`
`2`		`-`
`3`	`1`	`@testset "GraphDataFrameBridge" begin`
`4`	`2`
`5`	`3`	`# Test data from constructor`