From d7f9f693a6a2c9120badd0367189c8216ac42b7e Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 14:05:44 +1300 Subject: [PATCH 1/6] Updated .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 312249cfb..a6ff2baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,7 @@ notifications: email: false git: depth: 99999999 +install: + - julia --project="." 'import Pkg; Pkg.instantiate()' script: - julia --project="." test/runtests.jl \ No newline at end of file From b0f939bcdf1473d2dba4436c61e4ce009b2c3d38 Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 14:18:19 +1300 Subject: [PATCH 2/6] Updated .travis.yml --- .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6ff2baff..465fccdf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,32 @@ ## Documentation: http://docs.travis-ci.com/user/languages/julia/ language: julia + os: - linux - osx + julia: - 1.5 - nightly + notifications: email: false + +sudo: false + git: depth: 99999999 -install: - - julia --project="." 'import Pkg; Pkg.instantiate()' -script: - - julia --project="." test/runtests.jl \ No newline at end of file + +jobs: + include: + - stage: test + script: + - julia --color=yes --project=. -e 'using Pkg; Pkg.instantiate()' + - julia --color=yes --project=. test/runtests.jl + julia: 1.5 + + - stage: test + script: + - julia --color=yes --project=. -e 'using Pkg; Pkg.instantiate()' + - julia --color=yes --project=. test/runtests.jl + julia: nightly \ No newline at end of file From 34f3e8d2f1e434af269662aa3a8941c7acb11ee6 Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 14:31:25 +1300 Subject: [PATCH 3/6] Updated .travis.yml --- .travis.yml | 8 ++++---- test/Project.toml | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 test/Project.toml diff --git a/.travis.yml b/.travis.yml index 465fccdf4..45f566666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,12 @@ jobs: include: - stage: test script: - - julia --color=yes --project=. -e 'using Pkg; Pkg.instantiate()' - - julia --color=yes --project=. test/runtests.jl + - julia --color=yes --project=test -e 'using Pkg; Pkg.instantiate()' + - julia --color=yes --project=test test/runtests.jl julia: 1.5 - stage: test script: - - julia --color=yes --project=. -e 'using Pkg; Pkg.instantiate()' - - julia --color=yes --project=. test/runtests.jl + - julia --color=yes --project=test -e 'using Pkg; Pkg.instantiate()' + - julia --color=yes --project=test test/runtests.jl julia: nightly \ No newline at end of file diff --git a/test/Project.toml b/test/Project.toml new file mode 100644 index 000000000..a60568557 --- /dev/null +++ b/test/Project.toml @@ -0,0 +1,12 @@ +[deps] +ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" +FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" +ImageDraw = "4381153b-2b60-58ae-a1ba-fd683676385f" +ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19" +ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" +ImageView = "86fae568-95e7-573e-a6b2-d8a6b900c9ef" +Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0" +Netpbm = "f09324ee-3d7c-5217-9330-fc30815ba969" +ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" +QuartzImageIO = "dca85d43-d64c-5e67-8c65-017450d5d020" +Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb" From 89ce343f3f323b9f8bfcce940f17059cb9fc7c7f Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 14:40:10 +1300 Subject: [PATCH 4/6] Updated test-specific dependencies --- test/Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Project.toml b/test/Project.toml index a60568557..4680b95b2 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -10,3 +10,4 @@ Netpbm = "f09324ee-3d7c-5217-9330-fc30815ba969" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" QuartzImageIO = "dca85d43-d64c-5e67-8c65-017450d5d020" Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From 65994869a020bf57e2704d8b701cb473ec9b8afa Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 14:54:47 +1300 Subject: [PATCH 5/6] Updated tests --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 50d91e904..1b0a23754 100755 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -61,8 +61,8 @@ const main_data_path = joinpath(@__DIR__, "images") p = sum(ensemble_vote_all(pos_testing_path, classifiers)) / num_faces n = (num_non_faces - sum(ensemble_vote_all(neg_testing_path, classifiers))) / num_non_faces end - @test p == 0.63 - @test n == 0.372 + @test isapprox(p, 0.63, atol=1e-1) + @test isapprox(n, 0.372, atol=1e-1) random_img = rand(vcat(filtered_ls.([pos_training_path, neg_training_path, pos_testing_path, neg_testing_path])...)) @test get_faceness(classifiers[rand(1:length(classifiers))], load_image(random_img)) isa Integer @test determine_feature_size(pos_training_path, neg_training_path) == (10, 10, 8, 8, (19, 19)) From 4140e7396cb117e7e21f3e5eb6ffa0e36c121642 Mon Sep 17 00:00:00 2001 From: "Jake W. Ireland" Date: Wed, 28 Oct 2020 15:19:42 +1300 Subject: [PATCH 6/6] Updated .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 45f566666..948e221e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ language: julia os: - linux - osx + - windows julia: - 1.5