diff --git a/Project.toml b/Project.toml index c4102ed9..af3c438f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "IceFloeTracker" uuid = "04643c7a-9ac6-48c5-822f-2704f9e70bd3" authors = ["bradford roarr and contributors"] -version = "0.4.2" +version = "0.5.0" [deps] AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9" diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index c9cc4d1f..5ea16628 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -16,6 +16,7 @@ using DSP using StaticArrays using OffsetArrays: centered using Serialization: serialize, deserialize +using TOML export readdlm, padnhood, @@ -68,7 +69,13 @@ include("special_strels.jl") const sk_measure = PyNULL() const getlatlon = PyNULL() -const IFTVERSION = VersionNumber(0, 4, 0) + +function get_version_from_toml(pth=dirname(dirname(pathof(IceFloeTracker))))::VersionNumber + toml = TOML.parsefile(joinpath(pth, "Project.toml")) + return VersionNumber(toml["version"]) +end + +const IFTVERSION = get_version_from_toml() function __init__() copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) @@ -138,34 +145,34 @@ julia> IceFloeTracker.MorphSE.dilate(a, se) ``` """ module MorphSE - using ImageCore - using ColorTypes - using LoopVectorization - using OffsetArrays - using TiledIteration: EdgeIterator - using DataStructures - include("morphSE/StructuringElements.jl") - using .StructuringElements - include("morphSE/extreme_filter.jl") - include("morphSE/utils.jl") - include("morphSE/dilate.jl") - include("morphSE/erode.jl") - include("morphSE/opening.jl") - include("morphSE/closing.jl") - include("morphSE/bothat.jl") - include("morphSE/mreconstruct.jl") - include("morphSE/fill_holes.jl") +using ImageCore +using ColorTypes +using LoopVectorization +using OffsetArrays +using TiledIteration: EdgeIterator +using DataStructures +include("morphSE/StructuringElements.jl") +using .StructuringElements +include("morphSE/extreme_filter.jl") +include("morphSE/utils.jl") +include("morphSE/dilate.jl") +include("morphSE/erode.jl") +include("morphSE/opening.jl") +include("morphSE/closing.jl") +include("morphSE/bothat.jl") +include("morphSE/mreconstruct.jl") +include("morphSE/fill_holes.jl") end module Register - include("Register/CenterIndexedArrays.jl-0.2.0/CenterIndexedArrays.jl") - include("Register/RegisterCore.jl-0.2.4/src/RegisterCore.jl") - include("Register/RegisterMismatchCommon.jl-master/RegisterMismatchCommon.jl") - include("Register/RegisterUtilities.jl-master/RegisterUtilities.jl") - include("Register/RFFT.jl-master/RFFT.jl") - include("Register/RegisterDeformation.jl-0.4.4/RegisterDeformation.jl") - include("Register/QuadDIRECT.jl-master/QuadDIRECT.jl") - include("Register/RegisterQD.jl-0.3.1/RegisterQD.jl") - include("Register/RegisterMismatch.jl-0.4.0/RegisterMismatch.jl") +include("Register/CenterIndexedArrays.jl-0.2.0/CenterIndexedArrays.jl") +include("Register/RegisterCore.jl-0.2.4/src/RegisterCore.jl") +include("Register/RegisterMismatchCommon.jl-master/RegisterMismatchCommon.jl") +include("Register/RegisterUtilities.jl-master/RegisterUtilities.jl") +include("Register/RFFT.jl-master/RFFT.jl") +include("Register/RegisterDeformation.jl-0.4.4/RegisterDeformation.jl") +include("Register/QuadDIRECT.jl-master/QuadDIRECT.jl") +include("Register/RegisterQD.jl-0.3.1/RegisterQD.jl") +include("Register/RegisterMismatch.jl-0.4.0/RegisterMismatch.jl") end end diff --git a/test/test-misc.jl b/test/test-misc.jl index 23608950..44cb45d6 100644 --- a/test/test-misc.jl +++ b/test/test-misc.jl @@ -1,3 +1,10 @@ println("------------------------------------------------ ----------------- Misc. Tests ------------------") -@test IFTVERSION == VersionNumber(0, 4, 0) + + +# Define a test to check the version number of the package matches the version number in the Project.toml file. Use the get_version_from_toml function to get the version number from the Project.toml file. The version number is then compared to the version number of the package. If the version numbers match, the test passes. If the version numbers do not match, the test fails. + +@testset "Version number" begin + @test IceFloeTracker.get_version_from_toml(dirname((@__DIR__))) == IFTVERSION +end +