From 019783ece35a2ae9b7bf841dcd8c0ef13dc3ceba Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Sat, 19 Aug 2023 23:12:05 -0400 Subject: [PATCH 1/5] feat: hardcode pkg version number --- src/IceFloeTracker.jl | 13 ++----------- test/test-misc.jl | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index d7466eb5..434d81ac 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -39,7 +39,7 @@ export readdlm, matchcorr, centered, imrotate, - getiftversion + IFTVERSION # For IFTPipeline using HDF5 @@ -67,14 +67,9 @@ include("special_strels.jl") const sk_measure = PyNULL() const getlatlon = PyNULL() -const _version = [] +const IFTVERSION = VersionNumber(0,2,0) function __init__() - try - push!(_version, Pkg.TOML.parsefile("Project.toml")["version"]) - catch - push!(_version, "unknown") - end copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) pyimport_conda("pyproj", "pyproj=3.6.0") pyimport_conda("rasterio", "rasterio=1.3.7") @@ -83,10 +78,6 @@ function __init__() return nothing end -function getiftversion() - return first(_version) -end - include("regionprops.jl") include("segmentation_a_direct.jl") include("segmentation_b.jl") diff --git a/test/test-misc.jl b/test/test-misc.jl index 5dc55f27..54c34ad8 100644 --- a/test/test-misc.jl +++ b/test/test-misc.jl @@ -1,3 +1,3 @@ println("------------------------------------------------ ----------------- Misc. Tests ------------------") -@test getiftversion() == "0.2.0" +@test IFTVERSION == VersionNumber(0,2,0) From 86c4ca5cb1e4185f18e69fb9556cc793fdb5ffae Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Sun, 20 Aug 2023 14:27:10 -0400 Subject: [PATCH 2/5] Update src/IceFloeTracker.jl Co-authored-by: Timothy Divoll --- src/IceFloeTracker.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index 434d81ac..c3111331 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -67,7 +67,7 @@ include("special_strels.jl") const sk_measure = PyNULL() const getlatlon = PyNULL() -const IFTVERSION = VersionNumber(0,2,0) +const IFTVERSION = Pkg.project().version function __init__() copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) From d99c22cb905ae7e33eef8d19968ae136272845ed Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Sun, 20 Aug 2023 14:27:36 -0400 Subject: [PATCH 3/5] Update test/test-misc.jl Co-authored-by: Timothy Divoll --- test/test-misc.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-misc.jl b/test/test-misc.jl index 54c34ad8..ec545539 100644 --- a/test/test-misc.jl +++ b/test/test-misc.jl @@ -1,3 +1,3 @@ println("------------------------------------------------ ----------------- Misc. Tests ------------------") -@test IFTVERSION == VersionNumber(0,2,0) +@test IFTVERSION == Pkg.project().version From 1640a215677cae1b5ae36b72089b9b95e00ba09d Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Sun, 20 Aug 2023 14:39:44 -0400 Subject: [PATCH 4/5] restore hard coding version number --- src/IceFloeTracker.jl | 54 +++++++++++++++++++++---------------------- test/test-misc.jl | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index c3111331..d5813eed 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -67,7 +67,7 @@ include("special_strels.jl") const sk_measure = PyNULL() const getlatlon = PyNULL() -const IFTVERSION = Pkg.project().version +const IFTVERSION = VersionNumber(0, 2, 0) function __init__() copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) @@ -135,34 +135,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 ec545539..1afe1420 100644 --- a/test/test-misc.jl +++ b/test/test-misc.jl @@ -1,3 +1,3 @@ println("------------------------------------------------ ----------------- Misc. Tests ------------------") -@test IFTVERSION == Pkg.project().version +@test IFTVERSION == VersionNumber(0, 2, 0) From 748628e1db8568db8a54b71dec24f26bb9b1b4ef Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Mon, 21 Aug 2023 08:56:42 -0400 Subject: [PATCH 5/5] fix: update version number for registration --- Project.toml | 2 +- src/IceFloeTracker.jl | 2 +- test/test-misc.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 44b4a7be..4360cf1c 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.2.0" +version = "0.2.1" [deps] AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9" diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index d5813eed..8aaf66fd 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -67,7 +67,7 @@ include("special_strels.jl") const sk_measure = PyNULL() const getlatlon = PyNULL() -const IFTVERSION = VersionNumber(0, 2, 0) +const IFTVERSION = VersionNumber(0, 2, 1) function __init__() copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) diff --git a/test/test-misc.jl b/test/test-misc.jl index 1afe1420..9b6f2a3c 100644 --- a/test/test-misc.jl +++ b/test/test-misc.jl @@ -1,3 +1,3 @@ println("------------------------------------------------ ----------------- Misc. Tests ------------------") -@test IFTVERSION == VersionNumber(0, 2, 0) +@test IFTVERSION == VersionNumber(0, 2, 1)