Fix deprecations (#55)

* fix deprecation, version bounds

* travis correct path

Author: matbesancon

.travis.yml

@@ -25,10 +25,5 @@ git:
 #before_script: # homebrew for mac
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
 
-# uncomment the following lines to override the default test script
-# script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'using Pkg; Pkg.add(PackageSpec(url=pwd())); Pkg.build("SimpleWeightedGraphs"); Pkg.test("SimpleWeightedGraphs"; coverage=true)'
 after_success:
-  # push coverage results to Codecov
-  - julia -e 'using Pkg; cd(Pkg.dir("SimpleWeightedGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'

Project.toml

@@ -8,3 +8,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[compat]
+julia = "1"
+LightGraphs = "1.3"

REQUIRE

@@ -39,7 +39,7 @@ function laplacian_matrix(g::AbstractSimpleWeightedGraph, T::DataType=weighttype
     degree_matrix(g, T; dir=dir) - adjacency_matrix(g, T; dir=dir)
 end
 
-function pagerank(g::SimpleWeightedDiGraph, α=0.85, n=100::Integer, ϵ=1.0e-6)
+function pagerank(g::SimpleWeightedDiGraph, α=0.85, n::Integer=100, ϵ=1.0e-6)
     A = weights(g)
     S = vec(sum(A, dims=1))
     S = 1 ./ S

src/overrides.jl

@@ -1,5 +1,5 @@
 @testset "Overrides" begin
-    g3 = SimpleWeightedGraph(PathGraph(5))
+    g3 = SimpleWeightedGraph(path_graph(5))
     g3_d = [1. 0. 0. 0. 0.;
             0. 2. 0. 0. 0.;
             0. 0. 2. 0. 0.;
@@ -37,7 +37,7 @@
         @test adjacency_matrix(g; dir=:out) == adjacency_matrix(g; dir=:in)'
         @test issymmetric(laplacian_matrix(g))
         @test laplacian_matrix(g, Float64) ≈ g3_l
-        @test g[1:3] == SimpleWeightedGraph{eltype(g), weighttype(g)}(PathGraph(3))
+        @test g[1:3] == SimpleWeightedGraph{eltype(g), weighttype(g)}(path_graph(3))
         gx = copy(g)
         add_edge!(gx, 2, 3, 99)
         gi = gx[2:4]
@@ -66,7 +66,7 @@
         @test_throws ErrorException pagerank(g, 2)
         @test_throws ErrorException pagerank(g, 0.85, 2)
 
-        gc = SimpleWeightedDiGraph(PathDiGraph(2), 2)
+        gc = SimpleWeightedDiGraph(path_digraph(2), 2)
         @test g[2:3] == SimpleWeightedDiGraph{eltype(g5), weighttype(g5)}(gc)
         @test weights(g[2:3])[1, 2] == 2
     end

test/overrides.jl

@@ -9,12 +9,12 @@ using SimpleWeightedGraphs
     @test @inferred(eltype(SimpleWeightedGraph(adjmx1))) == Int
     @test_throws ErrorException SimpleWeightedGraph(adjmx2)
 
-    @test @inferred(ne(SimpleWeightedGraph(PathDiGraph(5)))) == 4
+    @test @inferred(ne(SimpleWeightedGraph(path_digraph(5)))) == 4
     @test @inferred(!is_directed(SimpleWeightedGraph))
 
     @test @inferred(eltype(SimpleWeightedDiGraph())) == Int
     @test @inferred(eltype(SimpleWeightedDiGraph(adjmx2))) == Int
-    @test @inferred(ne(SimpleWeightedDiGraph(PathGraph(5)))) == 8
+    @test @inferred(ne(SimpleWeightedDiGraph(path_graph(5)))) == 8
     @test @inferred(is_directed(SimpleWeightedDiGraph))
 
 
@@ -23,7 +23,7 @@ using SimpleWeightedGraphs
         @test @inferred(!add_vertices!(gbig, 10))
     end
 
-    gdx = SimpleWeightedDiGraph(PathDiGraph(4))
+    gdx = SimpleWeightedDiGraph(path_digraph(4))
     gx = SimpleWeightedGraph()
     for g in testgraphs(gx)
         T = eltype(g)
@@ -41,7 +41,7 @@ using SimpleWeightedGraphs
         @test sprint(show, g) == "{5, 0} directed simple $T graph with $U weights"
     end
 
-    gx = SimpleWeightedGraph(PathGraph(4))
+    gx = SimpleWeightedGraph(path_graph(4))
 
     gc = copy(gx)
     @test_logs (:warn, "Note: adding edges with a zero weight to this graph type has no effect.") add_edge!(gc, 4, 1, 0.0)
@@ -56,13 +56,13 @@ using SimpleWeightedGraphs
         @test @inferred(has_edge(g, 3, 2))
 
         gc = copy(g)
-        @test @inferred(add_edge!(gc, 4=>1)) && gc == SimpleWeightedGraph(CycleGraph(4))
+        @test @inferred(add_edge!(gc, 4=>1)) && gc == SimpleWeightedGraph(cycle_graph(4))
         @test @inferred(has_edge(gc, 4=>1)) && has_edge(gc, 0x04=>0x01)
         gc = copy(g)
-        @test @inferred(add_edge!(gc, (4,1))) && gc == SimpleWeightedGraph(CycleGraph(4))
+        @test @inferred(add_edge!(gc, (4,1))) && gc == SimpleWeightedGraph(cycle_graph(4))
         @test @inferred(has_edge(gc, (4,1))) && has_edge(gc, (0x04, 0x01))
         gc = copy(g)
-        @test add_edge!(gc, 4, 1) && gc == SimpleWeightedGraph(CycleGraph(4))
+        @test add_edge!(gc, 4, 1) && gc == SimpleWeightedGraph(cycle_graph(4))
 
         @test @inferred(inneighbors(g, 2)) == @inferred(outneighbors(g, 2)) == @inferred(neighbors(g,2)) == [1,3]
         @test @inferred(add_vertex!(gc))   # out of order, but we want it for issubset
@@ -104,7 +104,7 @@ using SimpleWeightedGraphs
         @test @inferred(has_edge(g, e))
     end
 
-    gdx = SimpleWeightedDiGraph(PathDiGraph(4))
+    gdx = SimpleWeightedDiGraph(path_digraph(4))
 
     gc = copy(gdx)
     @test_logs (:warn, "Note: adding edges with a zero weight to this graph type has no effect.") add_edge!(gc, 4, 1, 0.0)
@@ -122,13 +122,13 @@ using SimpleWeightedGraphs
         @test @inferred(!has_edge(g, 3, 2))
 
         gc = copy(g)
-        @test @inferred(add_edge!(gc, 4=>1)) && gc == SimpleWeightedDiGraph(CycleDiGraph(4))
+        @test @inferred(add_edge!(gc, 4=>1)) && gc == SimpleWeightedDiGraph(cycle_digraph(4))
         @test @inferred(has_edge(gc, 4=>1)) && has_edge(gc, 0x04=>0x01)
         gc = copy(g)
-        @test @inferred(add_edge!(gc, (4,1))) && gc == SimpleWeightedDiGraph(CycleDiGraph(4))
+        @test @inferred(add_edge!(gc, (4,1))) && gc == SimpleWeightedDiGraph(cycle_digraph(4))
         @test @inferred(has_edge(gc, (4,1))) && has_edge(gc, (0x04, 0x01))
         gc = @inferred(copy(g))
-        @test @inferred(add_edge!(gc, 4, 1)) && gc == SimpleWeightedDiGraph(CycleDiGraph(4))
+        @test @inferred(add_edge!(gc, 4, 1)) && gc == SimpleWeightedDiGraph(cycle_digraph(4))
 
         @test @inferred(inneighbors(g, 2)) == [1]
         @test @inferred(outneighbors(g, 2)) == @inferred(neighbors(g,2)) == [3]
@@ -172,7 +172,7 @@ using SimpleWeightedGraphs
         @test @inferred(has_edge(g, e))
     end
 
-    gdx = SimpleWeightedDiGraph(CompleteDiGraph(4))
+    gdx = SimpleWeightedDiGraph(complete_digraph(4))
     for g in testdigraphs(gdx)
         @test rem_vertex!(g, 2)
         @test nv(g) == 3 && ne(g) == 6
@@ -181,7 +181,7 @@ using SimpleWeightedGraphs
     @test sum(weights(g)) == 2 * ne(g) * 3
     @test @inferred(get_weight(g, 1, 2)) == 3
 
-    g = SimpleWeightedDiGraph(PathGraph(5), 4.0)
+    g = SimpleWeightedDiGraph(path_graph(5), 4.0)
     @test sum(weights(g)) == ne(g) * 4.0
 
     gx = Graph(4,3)
@@ -194,11 +194,11 @@ using SimpleWeightedGraphs
         @test eltype(SimpleWeightedGraph(g)) == eltype(g)
     end
 
-    s = SimpleWeightedGraph(PathGraph(5), 2)
+    s = SimpleWeightedGraph(path_graph(5), 2)
     s2 = SimpleWeightedGraph([1,2,3,4], [2,3,4,5], [2,2,2,2])
     @test s == s2
 
-    s = SimpleWeightedDiGraph(PathDiGraph(5), 2)
+    s = SimpleWeightedDiGraph(path_digraph(5), 2)
     s2 = SimpleWeightedDiGraph([1,2,3,4], [2,3,4,5], [2,2,2,2])
     @test s == s2