Skip to content

Commit

Permalink
Merge pull request #332 from WilhelmusLab/feat-add-getiftversion
Browse files Browse the repository at this point in the history
feat: hardcode pkg version number
  • Loading branch information
cpaniaguam authored Aug 21, 2023
2 parents ab41e35 + 748628e commit cea00f2
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 39 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "IceFloeTracker"
uuid = "04643c7a-9ac6-48c5-822f-2704f9e70bd3"
authors = ["bradford roarr <bradford_roarr@brown.edu> and contributors"]
version = "0.2.0"
version = "0.2.1"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Expand Down
65 changes: 28 additions & 37 deletions src/IceFloeTracker.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export readdlm,
matchcorr,
centered,
imrotate,
getiftversion
IFTVERSION

# For IFTPipeline
using HDF5
Expand Down Expand Up @@ -67,14 +67,9 @@ include("special_strels.jl")

const sk_measure = PyNULL()
const getlatlon = PyNULL()
const _version = []
const IFTVERSION = VersionNumber(0, 2, 1)

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")
Expand All @@ -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")
Expand Down Expand Up @@ -144,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
2 changes: 1 addition & 1 deletion test/test-misc.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
println("------------------------------------------------
----------------- Misc. Tests ------------------")
@test getiftversion() == "0.2.0"
@test IFTVERSION == VersionNumber(0, 2, 1)

2 comments on commit cea00f2

@cpaniaguam
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/90020

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.1 -m "<description of version>" cea00f265e17c90e4f2b508daf57e01bd9f411b3
git push origin v0.2.1

Please sign in to comment.