Merge 8f895c2 into 24e4289

JuliaFEM · Aug 22, 2018 · aedc305 · aedc305
2 parents 24e4289 + 8f895c2
commit aedc305
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: julia
+
 os:
     - linux
+
 julia:
-    - 0.6
-before_script:
-    - julia --color=yes -e 'Pkg.clone("https://github.com/JuliaFEM/PkgTestSuite.jl.git")'
-    - julia --color=yes -e 'using PkgTestSuite; init()'
-script:
-    - julia --color=yes -e 'using PkgTestSuite; test()'
+    - 0.7
+    - 1.0
+    - nightly
+
 after_success:
-    - julia --color=yes -e 'using PkgTestSuite; deploy()'
+    - julia -e 'cd(Pkg.dir("FEMQuad")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
diff --git a/REQUIRE b/REQUIRE
@@ -1,2 +1 @@
-julia 0.6
-Logging
+julia 0.7
diff --git a/docs/deploy.jl b/docs/deploy.jl
@@ -5,7 +5,7 @@ using Documenter
 
 deploydocs(
     repo = "github.com/JuliaFEM/FEMQuad.jl.git",
-    julia = "0.6",
+    julia = "1.0",
     target = "build",
     deps = nothing,
     make = nothing)
diff --git a/docs/make.jl b/docs/make.jl
@@ -6,7 +6,4 @@ using Documenter, FEMQuad
 makedocs(modules=[FEMQuad],
          format = :html,
          sitename = "FEMQuad.jl",
-         pages = [
-                  "Introduction" => "index.md",
-                  "API" => "api.md"
-                 ])
+         pages = ["index.md", "api.md"])
diff --git a/src/FEMQuad.jl b/src/FEMQuad.jl
@@ -24,7 +24,7 @@ function get_rule(order::Int, rules::Vararg{Symbol})
             return rule
         end
     end
-    warn("No accurate rule enough found, picking last.")
+    @warn("No accurate rule enough found, picking last.", order, rules)
     return rules[end]
 end
 

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -1 +1,2 @@
+Documenter
 TimerOutputs
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,27 +1,17 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
+using Test
 
-test_files = String[]
+include("../docs/make.jl")
 
-push!(test_files, "test_glseg.jl")
-push!(test_files, "test_glquad.jl")
-push!(test_files, "test_glhex.jl")
-push!(test_files, "test_gltri.jl")
-push!(test_files, "test_gltet.jl")
-push!(test_files, "test_glwed.jl")
-push!(test_files, "test_glpyr.jl")
-
-using TimerOutputs
-const to = TimerOutput()
 @testset "FEMQuad.jl" begin
-    for fn in test_files
-        timeit(to, fn) do
-            include(fn)
-        end
-    end
+    @testset "test_glseg" begin include("test_glseg.jl") end
+    @testset "test_glhex" begin include("test_glhex.jl") end
+    @testset "test_gltri" begin include("test_gltri.jl") end
+    @testset "test_gltet" begin include("test_gltet.jl") end
+    @testset "test_glwed" begin include("test_glwed.jl") end
+    @testset "test_glpyr" begin include("test_glpyr.jl") end
 end
-println()
-println("Test statistics:")
-println(to)
+
+include("../docs/deploy.jl")
diff --git a/test/test_glhex.jl b/test/test_glhex.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_3d, get_rule
 
 @testset "Gauss-Legendre quadratures in hexahedrons" begin

diff --git a/test/test_glpyr.jl b/test/test_glpyr.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_3d, get_rule
 
 @testset "Gauss-Legendre quadratures in pyramids" begin
@@ -11,4 +10,3 @@ using FEMQuad: integrate_3d, get_rule
     @test isapprox(integrate_3d(f(0), :GLPYR5B), 4.0/6.0)
     #@test isapprox(integrate_3d(f(1), :GLPYR5B), 7.0/6.0)
 end
-
diff --git a/test/test_glquad.jl b/test/test_glquad.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_2d, get_rule
 
 @testset "Gauss-Legendre quadratures in quadrilaterals" begin

diff --git a/test/test_glseg.jl b/test/test_glseg.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_1d, get_rule
 
 @testset "Gauss-Legendre quadratures in one dimension" begin

diff --git a/test/test_gltet.jl b/test/test_gltet.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_3d, get_rule
 
 @testset "Gauss-Legendre quadratures in tetrahedrons" begin

diff --git a/test/test_gltri.jl b/test/test_gltri.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_2d, get_rule
 
 @testset "Gauss-Legendre quadratures in triangles" begin

diff --git a/test/test_glwed.jl b/test/test_glwed.jl
@@ -1,8 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/FEMQuad.jl/blob/master/LICENSE
 
-using Base.Test
-using FEMQuad
+using FEMQuad, Test
 using FEMQuad: integrate_3d, get_rule
 
 @testset "Gauss-Legendre quadratures in prismatic domains" begin
@@ -21,4 +20,3 @@ using FEMQuad: integrate_3d, get_rule
     #@test isapprox(integrate_3d(f(6), :GLWED21), 4597.0/420.0)
     #@test isapprox(integrate_3d(f(7), :GLWED21), 20959.0/1260.0)
 end
-