Merge branch 'main' into feat-docker-build

Conflicts: src/h5.jl
WilhelmusLab · Aug 17, 2023 · 4db6b29 · 4db6b29
2 parents 2698fe8 + 2b3d215
commit 4db6b29
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/Project.toml b/Project.toml
@@ -5,6 +5,7 @@ version = "0.1.0"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
+Folds = "41a02a25-b8f0-4f67-bc48-60067656b558"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 IceFloeTracker = "04643c7a-9ac6-48c5-822f-2704f9e70bd3"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"

diff --git a/src/IFTPipeline.jl b/src/IFTPipeline.jl
@@ -8,10 +8,10 @@ using ArgParse
 using LoggingExtras
 using IceFloeTracker
 using IceFloeTracker: DataFrames, Dates, @dateformat_str, DataFrame, nrow, rename!, Not, select!, Date, Time, DateTime
-using IceFloeTracker: Folds, RGB, Gray, load, float64, imsharpen
+using IceFloeTracker: RGB, Gray, load, float64, imsharpen, getlatlon
+using Folds
 using HDF5
 using TOML: parsefile
-using PyCall
 using Pkg
 include("cli-config.jl")
 include("soit-parser.jl")

diff --git a/src/latlon.py b/src/latlon.py
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,15 +1,13 @@
 using IFTPipeline
 using IFTPipeline: load_imgs, sharpen, sharpen_gray, loadimg
 using IFTPipeline: HDF5, h5open, attrs
-using .IceFloeTracker: DataFrames, save, Gray, create_cloudmask, deserialize, serialize, float64, load, imrotate, loadimg, RGB, DataFrame, nrow, rename!, Dates, Not, select!
+using .IceFloeTracker: DataFrames, save, Gray, create_cloudmask, deserialize, serialize, float64, load, imrotate, loadimg, RGB, DataFrame, nrow, rename!, Dates, Not, select!, getlatlon
 using ArgParse: @add_arg_table!, ArgParseSettings, add_arg_group!, parse_args
 using DelimitedFiles
-using PyCall: @pyinclude, @py_str
 using Pkg
 using Random
 using Serialization
 using Test
-using Conda
 include(joinpath(@__DIR__, "config.jl"))
 
 function test_similarity(imgA::BitMatrix, imgB::BitMatrix, error_rate=0.005)

diff --git a/test/test-h5.jl b/test/test-h5.jl
@@ -4,8 +4,6 @@ resdir = joinpath(dirname(pathtosampleimg), "h5")
 
 originalbbox = (latitude=[81, 79], longitude=[-22, -12])
 
-@pyinclude(joinpath(@__DIR__, "../src/latlon.py"))
-getlatlon = py"getlatlon"
 latlondata = getlatlon(pathtosampleimg)
 
 getcorners(m) = [m[1, 1], m[end, end]]