Skip to content

Commit

Permalink
Merge branch 'master' into teh/latency
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnychen94 authored Apr 16, 2021
2 parents 09fdad8 + 5b2202d commit d8c5418
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/UnitTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ jobs:
run: |
using Pkg
Pkg.add([
PackageSpec(name="FFTW", version="1.1"),
PackageSpec(name="AbstractFFTs", version="0.5")
PackageSpec(name="AbstractFFTs", version="0.5"),
])
shell: julia --project=. --startup=no --color=yes {0}
- name: "Unit Test"
Expand Down
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Reexport = "0.2, 1.0"
julia = "1"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
Expand All @@ -39,4 +40,4 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ColorVectorSpace", "Documenter", "FFTW", "ImageInTerminal", "ImageMagick", "Random", "ReferenceTests", "Statistics", "Test"]
test = ["Aqua", "ColorVectorSpace", "Documenter", "FFTW", "ImageInTerminal", "ImageMagick", "Random", "ReferenceTests", "Statistics", "Test"]
28 changes: 14 additions & 14 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module ImageCoreTests

using ImageCore, Test, ReferenceTests

# If we've run the tests previously, there might be ambiguities from other packages
if :StatsBase map(x->Symbol(string(x)), values(Base.loaded_modules))
if Base.VERSION < v"1.6.0-DEV.1005"
ambs = detect_ambiguities(ImageCore, Base, Core)
ambs = filter(m1m2 -> ((m1, m2) = m1m2; m1.module === ImageCore || m2.module === ImageCore), ambs)
@test isempty(ambs)
else
@test isempty(detect_ambiguities(ImageCore))
end
using ImageCore
using Test, ReferenceTests
using Aqua, Documenter # for meta quality checks

@testset "Project meta quality checks" begin
# Not checking compat section for test-only dependencies
Aqua.test_all(ImageCore;
project_extras=true,
deps_compat=true,
stale_deps=true,
project_toml_formatting=true,
unbound_args=false, # FIXME: it fails when this is true
)
DocMeta.setdocmeta!(ImageCore, :DocTestSetup, :(using ImageCore); recursive=true)
end

using Documenter
DocMeta.setdocmeta!(ImageCore, :DocTestSetup, :(using ImageCore); recursive=true)

# ReferenceTests uses ImageInTerminal as a default image rendering backend, we need to
# temporarily disable it when we do doctest.
# TODO: ReferenceTests doesn't yet support this switch. That's why we need ImageInTerminal dependency.
Expand Down

0 comments on commit d8c5418

Please sign in to comment.