diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 239816b..5af813a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,6 @@ jobs: version: - '1.12' - '1.10' - - '1.6' - 'pre' os: - ubuntu-latest diff --git a/Project.toml b/Project.toml index 22656de..09d3dae 100644 --- a/Project.toml +++ b/Project.toml @@ -13,5 +13,5 @@ nauty_jll = "55c6dc9b-343a-50ca-8ff2-b71adb3733d5" Graphs = "1.9" LinearAlgebra = "1" SHA = "0.7, 1" -julia = "1.6" +julia = "1.10" nauty_jll = "2.8.9" diff --git a/test/densenautygraph.jl b/test/densenautygraph.jl index 5b790c7..ece1eed 100644 --- a/test/densenautygraph.jl +++ b/test/densenautygraph.jl @@ -1,17 +1,14 @@ -rng = Random.Random.MersenneTwister(0) # Use MersenneTwister for Julia 1.6 compat -symmetrize_adjmx(A) = (A = convert(typeof(A), (A + A') .> 0); for i in axes(A, 1); end; A) - @testset "densenautygraph" begin nverts = [1, 2, 3, 4, 5, 10, 20, 31, 32, 33, 50, 63, 64, 65, 100, 122, 123, 124, 125, 126, 200, 500, 1000] - As = [rand(rng, [0, 1], i, i) for i in nverts] + As = [rand(rng, 0:1, i, i) for i in nverts] wtypes = [UInt16, UInt32, UInt64] gs = [] ngs = [] for A in As, wt in wtypes - Asym = symmetrize_adjmx(A) + Asym = Int.((A + A') .> 0) push!(gs, Graph(Asym)) push!(gs, DiGraph(A)) push!(ngs, NautyGraph{wt}(Asym)) diff --git a/test/graphset.jl b/test/graphset.jl index 72114bb..53832db 100644 --- a/test/graphset.jl +++ b/test/graphset.jl @@ -1,5 +1,3 @@ -rng = Random.Random.MersenneTwister(0) # Use MersenneTwister for Julia 1.6 compat - function test_graphsets(A; mfacts) n, _ = size(A) for mf in mfacts diff --git a/test/runtests.jl b/test/runtests.jl index 1a29d37..d62705a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -4,12 +4,14 @@ using Test using Random, LinearAlgebra using Base.Threads +rng = Random.Xoshiro(0) + @testset verbose=true "NautyGraphs" begin include("densenautygraph.jl") include("nauty.jl") include("graphset.jl") include("utils.jl") - VERSION >= v"1.9-" && include("interface.jl") - include("aqua.jl") - VERSION >= v"1.10" && include("jet.jl") + include("interface.jl") + VERSION >= v"1.12" && include("aqua.jl") + VERSION >= v"1.12" && include("jet.jl") end