From b36daf451f00f27e05d649f89323c2b7c5d04a09 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 22 Mar 2022 16:44:23 +1300 Subject: [PATCH 1/2] Prep for v0.9.3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 763560f..5989025 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Tulip" uuid = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa" authors = ["Mathieu Tanneau "] -version = "0.9.2" +version = "0.9.3" [deps] CodecBzip2 = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd" From 7de795b602808f933cde876e77f2296d61baa202 Mon Sep 17 00:00:00 2001 From: mtanneau <9593025+mtanneau@users.noreply.github.com> Date: Tue, 22 Mar 2022 16:11:10 -0400 Subject: [PATCH 2/2] Improve version() code (#1) Co-authored-by: Mathieu Tanneau --- Project.toml | 1 + src/Tulip.jl | 11 ++++++++++- test/runtests.jl | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 5989025..56c3911 100644 --- a/Project.toml +++ b/Project.toml @@ -16,6 +16,7 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" QPSReader = "10f199a5-22af-520b-b891-7ce84a7b1bd0" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SuiteSparse = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" +TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" diff --git a/src/Tulip.jl b/src/Tulip.jl index 2698600..e077c78 100644 --- a/src/Tulip.jl +++ b/src/Tulip.jl @@ -4,10 +4,19 @@ using LinearAlgebra using Logging using Printf using SparseArrays +using TOML using TimerOutputs -version() = v"0.9.2" +const _TULIP_VERSION = Ref{VersionNumber}() + +function __init__() + # Read Tulip version from Project.toml file + tlp_ver = VersionNumber(TOML.parsefile(joinpath(@__DIR__, "..", "Project.toml"))["version"]) + _TULIP_VERSION[] = tlp_ver +end + +version() = _TULIP_VERSION[] include("utils.jl") diff --git a/test/runtests.jl b/test/runtests.jl index c6bb783..ff24218 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -8,12 +8,12 @@ TLP = Tulip const TvTYPES = [Float32, Float64, BigFloat] -@testset "Tulip" begin - # Check That Tulip.version() matches what's in the Project.toml tlp_ver = Tulip.version() -toml_ver = TOML.parsefile("../Project.toml")["version"] -@test tlp_ver == VersionNumber(toml_ver) +toml_ver = VersionNumber(TOML.parsefile(joinpath(@__DIR__, "..", "Project.toml"))["version"]) +@test tlp_ver == toml_ver + +@testset "Tulip" begin @testset "Unit tests" begin