Skip to content

Commit 5dad3ab

Browse files
authored
Merge branch 'main' into feat/st-relate-text
2 parents cedfd67 + 1ac184d commit 5dad3ab

File tree

26 files changed

+3670
-16
lines changed

26 files changed

+3670
-16
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- name: Install dependencies
129129
shell: bash
130130
run: |
131-
sudo apt-get update && sudo apt-get install -y libgeos-dev
131+
sudo apt-get update && sudo apt-get install -y libgeos-dev libgdal-dev
132132
133133
- name: Check
134134
if: matrix.name == 'check'

Cargo.lock

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ members = [
2020
"c/sedona-geoarrow-c",
2121
"c/sedona-geos",
2222
"c/sedona-libgpuspatial",
23+
"c/sedona-gdal",
2324
"c/sedona-proj",
2425
"c/sedona-s2geography",
2526
"c/sedona-tg",
@@ -150,6 +151,7 @@ sedona-testing = { version = "0.3.0", path = "rust/sedona-testing" }
150151
# C wrapper crates
151152
sedona-geoarrow-c = { version = "0.3.0", path = "c/sedona-geoarrow-c" }
152153
sedona-geos = { version = "0.3.0", path = "c/sedona-geos" }
154+
sedona-gdal = { version = "0.3.0", path = "c/sedona-gdal", default-features = false }
153155
sedona-proj = { version = "0.3.0", path = "c/sedona-proj", default-features = false }
154156
sedona-s2geography = { version = "0.3.0", path = "c/sedona-s2geography" }
155157
sedona-tg = { version = "0.3.0", path = "c/sedona-tg" }

c/sedona-gdal/Cargo.toml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
[package]
19+
name = "sedona-gdal"
20+
version.workspace = true
21+
license.workspace = true
22+
keywords.workspace = true
23+
categories.workspace = true
24+
authors.workspace = true
25+
homepage.workspace = true
26+
repository.workspace = true
27+
description.workspace = true
28+
readme.workspace = true
29+
edition.workspace = true
30+
rust-version.workspace = true
31+
32+
[dependencies]
33+
gdal-sys = { version = "0.12.0", optional = true }
34+
libloading = { workspace = true }
35+
thiserror = { workspace = true }
36+
37+
[features]
38+
default = ["gdal-sys"]
39+
gdal-sys = ["dep:gdal-sys"]
40+
41+
[dev-dependencies]
42+
sedona-testing = { workspace = true }

0 commit comments

Comments
 (0)