Skip to content

Commit

Permalink
Merge pull request #366 from WilhelmusLab/365-update-iftversion-=-043
Browse files Browse the repository at this point in the history 
chore: update version nums
  • Loading branch information
@cpaniaguam
cpaniaguam authored Apr 3, 2024
2 parents 0fde544 + 27af0c0 commit 351d7a5
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Project.toml
View file
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 <[email protected]> and contributors"]
version = "0.4.2"
version = "0.5.0"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Expand Down
61 changes: 34 additions & 27 deletions src/IceFloeTracker.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ using DSP
using StaticArrays
using OffsetArrays: centered
using Serialization: serialize, deserialize
using TOML

export readdlm,
padnhood,
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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
9 changes: 8 additions & 1 deletion test/test-misc.jl
View file
Original file line number Diff line number Diff line change
@@ -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

2 comments on commit 351d7a5

@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 register

@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/104202

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

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.5.0 -m "<description of version>" 351d7a5113a027df2a6041a1a94c758cc14097f8
git push origin v0.5.0

Please sign in to comment.