fix travis (#36)

* fix travis

* switch to GLPK

* remove Clp from Project

.travis.yml

@@ -33,6 +33,22 @@ after_success:
  - julia -e 'cd(Pkg.dir("LightGraphsFlows")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
  # push coverage results to Codecov
  - julia -e 'cd(Pkg.dir("LightGraphsFlows")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- # Build documentation
- - julia -e 'Pkg.add("Documenter")'
- - julia -e 'cd(Pkg.dir("LightGraphsFlows")); include(joinpath("docs", "make.jl"))'
+
+branches:
+ only:
+ - master
+ - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+
+jobs:
+ allow_failures:
+ - julia: nightly
+ fast_finish: true
+ include:
+ - stage: "Documentation"
+ julia: 1.0
+ os: linux
+ script:
+ - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
+ Pkg.instantiate()'
+ - julia --project=docs/ docs/make.jl
+ after_success: skip

Project.toml

@@ -18,8 +18,8 @@ SimpleTraits = "0.9"
 julia = "1"
 
 [extras]
-Clp = "e2554f3b-3117-50c0-817c-e040a3ddf72d"
+GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Clp", "Test"]
+test = ["GLPK", "Test"]

test/mincost.jl

@@ -1,4 +1,4 @@
-import Clp
+import GLPK
 using JuMP
 
 using SparseArrays: spzeros
@@ -27,7 +27,7 @@ using SparseArrays: spzeros
  demand[4,6] = 1
  capacity = ones(6,6)
 
- o = with_optimizer(Clp.Optimizer)
+ o = with_optimizer(GLPK.Optimizer)
  node_demand = spzeros(lg.nv(g))
  flow = mincost_flow(g, node_demand, capacity, cost, o, edge_demand=demand, source_nodes=[5], sink_nodes=[6])
  @test flow[5,1] ≈ 1

test/runtests.jl

@@ -6,6 +6,9 @@ const lg = LightGraphs
 
 using LinearAlgebra: diag
 
+using JuMP
+import GLPK
+
 const testdir = dirname(@__FILE__)
 
 testgraphs(g) = [g, lg.Graph{UInt8}(g), lg.Graph{Int16}(g)]