Skip to content

Commit 841339d

Browse files
committed
wrap GEOS 3.10.2
And add warning/reminder to tests to regenerate bindings if the versions don't match.
1 parent 9295e3a commit 841339d

File tree

3 files changed

+27
-40
lines changed

3 files changed

+27
-40
lines changed

gen/Manifest.toml

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.2"
3+
julia_version = "1.7.3"
44
manifest_format = "2.0"
55

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

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

5050
[[deps.CompilerSupportLibraries_jll]]
5151
deps = ["Artifacts", "Libdl"]
@@ -58,31 +58,26 @@ version = "4.1.1"
5858

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

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

69-
[[deps.DelimitedFiles]]
70-
deps = ["Mmap"]
71-
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
72-
73-
[[deps.Distributed]]
74-
deps = ["Random", "Serialization", "Sockets"]
75-
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
76-
7769
[[deps.Downloads]]
78-
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
70+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
7971
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
8072

73+
[[deps.FileWatching]]
74+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
75+
8176
[[deps.GEOS_jll]]
8277
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
83-
git-tree-sha1 = "07f6426d716d0d110cdede90ebd3bbb2f3be0d8c"
78+
git-tree-sha1 = "4ceb4cdae127931b852ced4d3782bb51ab5e2632"
8479
uuid = "d604d12d-fa86-5845-992e-78dc15976526"
85-
version = "3.10.0+0"
80+
version = "3.10.2+0"
8681

8782
[[deps.InteractiveUtils]]
8883
deps = ["Markdown"]
@@ -102,9 +97,9 @@ version = "0.21.3"
10297

10398
[[deps.JuliaFormatter]]
10499
deps = ["CSTParser", "CommonMark", "DataStructures", "Pkg", "Tokenize"]
105-
git-tree-sha1 = "64613299ded610bc40afeea529918d4baf3cf4e5"
100+
git-tree-sha1 = "572cbc7adc60b5f01fbb86c2cd624b308d3cb514"
106101
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
107-
version = "0.22.10"
102+
version = "1.0.2"
108103

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

201-
[[deps.SharedArrays]]
202-
deps = ["Distributed", "Mmap", "Random", "Serialization"]
203-
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
204-
205196
[[deps.Sockets]]
206197
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
207198

208-
[[deps.SparseArrays]]
209-
deps = ["LinearAlgebra", "Random"]
210-
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
211-
212-
[[deps.Statistics]]
213-
deps = ["LinearAlgebra", "SparseArrays"]
214-
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
215-
216199
[[deps.TOML]]
217200
deps = ["Dates"]
218201
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
@@ -221,14 +204,10 @@ uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
221204
deps = ["ArgTools", "SHA"]
222205
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
223206

224-
[[deps.Test]]
225-
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
226-
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
227-
228207
[[deps.Tokenize]]
229-
git-tree-sha1 = "1f426012d5656a6ac74d18805f46e2a955c1ceb0"
208+
git-tree-sha1 = "2b3af135d85d7e70b863540160208fa612e736b9"
230209
uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
231-
version = "0.5.23"
210+
version = "0.5.24"
232211

233212
[[deps.URIs]]
234213
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"

src/libgeos_api.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,9 +3415,9 @@ const GEOS_VERSION_MAJOR = 3
34153415

34163416
const GEOS_VERSION_MINOR = 10
34173417

3418-
const GEOS_VERSION_PATCH = 0
3418+
const GEOS_VERSION_PATCH = 2
34193419

3420-
const GEOS_VERSION = "3.10.0"
3420+
const GEOS_VERSION = "3.10.2"
34213421

34223422
const GEOS_JTS_PORT = "1.18.0"
34233423

@@ -3427,7 +3427,7 @@ const GEOS_CAPI_VERSION_MINOR = 16
34273427

34283428
const GEOS_CAPI_VERSION_PATCH = 0
34293429

3430-
const GEOS_CAPI_VERSION = "3.10.0-CAPI-1.16.0"
3430+
const GEOS_CAPI_VERSION = "3.10.2-CAPI-1.16.0"
34313431

34323432
const GEOS_CAPI_FIRST_INTERFACE = GEOS_CAPI_VERSION_MAJOR
34333433

test/runtests.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ using Test, LibGEOS
44
version = LibGEOS.GEOSversion()
55
@info "GEOS version $version"
66

7+
if version != LibGEOS.GEOS_CAPI_VERSION
8+
@warn string(
9+
"The GEOS version in use is different from the version used to ",
10+
"generate libgeos_api.jl. Consider regenerating if the difference is more than a ",
11+
"patch release.",
12+
) run_version = version gen_version = LibGEOS.GEOS_CAPI_VERSION
13+
end
14+
715
@testset "LibGEOS" begin
816
include("test_geos_functions.jl")
917
include("test_geos_operations.jl")

0 commit comments

Comments
 (0)