Skip to content

Commit

Permalink
wrap GEOS 3.10.2
Browse files Browse the repository at this point in the history
And add warning/reminder to tests to regenerate
bindings if the versions don't match.
  • Loading branch information
visr committed Jun 1, 2022
1 parent 9295e3a commit 841339d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 40 deletions.
53 changes: 16 additions & 37 deletions gen/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.7.2"
julia_version = "1.7.3"
manifest_format = "2.0"

[[deps.ArgTools]]
Expand Down Expand Up @@ -42,10 +42,10 @@ uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6"
version = "0.8.6"

[[deps.Compat]]
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b"
deps = ["Dates", "LinearAlgebra", "UUIDs"]
git-tree-sha1 = "924cdca592bc16f14d2f7006754a621735280b74"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "3.43.0"
version = "4.1.0"

[[deps.CompilerSupportLibraries_jll]]
deps = ["Artifacts", "Libdl"]
Expand All @@ -58,31 +58,26 @@ version = "4.1.1"

[[deps.DataStructures]]
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
git-tree-sha1 = "cc1a8e22627f33c789ab60b36a9132ac050bbf75"
git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0"
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
version = "0.18.12"
version = "0.18.13"

[[deps.Dates]]
deps = ["Printf"]
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[[deps.DelimitedFiles]]
deps = ["Mmap"]
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"

[[deps.Distributed]]
deps = ["Random", "Serialization", "Sockets"]
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

[[deps.Downloads]]
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"

[[deps.FileWatching]]
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"

[[deps.GEOS_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
git-tree-sha1 = "07f6426d716d0d110cdede90ebd3bbb2f3be0d8c"
git-tree-sha1 = "4ceb4cdae127931b852ced4d3782bb51ab5e2632"
uuid = "d604d12d-fa86-5845-992e-78dc15976526"
version = "3.10.0+0"
version = "3.10.2+0"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
Expand All @@ -102,9 +97,9 @@ version = "0.21.3"

[[deps.JuliaFormatter]]
deps = ["CSTParser", "CommonMark", "DataStructures", "Pkg", "Tokenize"]
git-tree-sha1 = "64613299ded610bc40afeea529918d4baf3cf4e5"
git-tree-sha1 = "572cbc7adc60b5f01fbb86c2cd624b308d3cb514"
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
version = "0.22.10"
version = "1.0.2"

[[deps.LibCURL]]
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
Expand Down Expand Up @@ -198,21 +193,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[deps.SharedArrays]]
deps = ["Distributed", "Mmap", "Random", "Serialization"]
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"

[[deps.Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

[[deps.SparseArrays]]
deps = ["LinearAlgebra", "Random"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[[deps.Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[[deps.TOML]]
deps = ["Dates"]
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Expand All @@ -221,14 +204,10 @@ uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
deps = ["ArgTools", "SHA"]
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"

[[deps.Test]]
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[deps.Tokenize]]
git-tree-sha1 = "1f426012d5656a6ac74d18805f46e2a955c1ceb0"
git-tree-sha1 = "2b3af135d85d7e70b863540160208fa612e736b9"
uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
version = "0.5.23"
version = "0.5.24"

[[deps.URIs]]
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
Expand Down
6 changes: 3 additions & 3 deletions src/libgeos_api.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3415,9 +3415,9 @@ const GEOS_VERSION_MAJOR = 3

const GEOS_VERSION_MINOR = 10

const GEOS_VERSION_PATCH = 0
const GEOS_VERSION_PATCH = 2

const GEOS_VERSION = "3.10.0"
const GEOS_VERSION = "3.10.2"

const GEOS_JTS_PORT = "1.18.0"

Expand All @@ -3427,7 +3427,7 @@ const GEOS_CAPI_VERSION_MINOR = 16

const GEOS_CAPI_VERSION_PATCH = 0

const GEOS_CAPI_VERSION = "3.10.0-CAPI-1.16.0"
const GEOS_CAPI_VERSION = "3.10.2-CAPI-1.16.0"

const GEOS_CAPI_FIRST_INTERFACE = GEOS_CAPI_VERSION_MAJOR

Expand Down
8 changes: 8 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ using Test, LibGEOS
version = LibGEOS.GEOSversion()
@info "GEOS version $version"

if version != LibGEOS.GEOS_CAPI_VERSION
@warn string(
"The GEOS version in use is different from the version used to ",
"generate libgeos_api.jl. Consider regenerating if the difference is more than a ",
"patch release.",
) run_version = version gen_version = LibGEOS.GEOS_CAPI_VERSION
end

@testset "LibGEOS" begin
include("test_geos_functions.jl")
include("test_geos_operations.jl")
Expand Down

0 comments on commit 841339d

Please sign in to comment.