Skip to content

Commit 2d1d19b

Browse files
committed
use workspace dependencies, update toolchain, use global lock in expression
1 parent db8351b commit 2d1d19b

File tree

24 files changed

+1383
-1381
lines changed

24 files changed

+1383
-1381
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,117 @@ print_stderr = { level = "warn", priority = 1 }
5252
print_stdout = { level = "warn", priority = 1 }
5353
unimplemented = { level = "warn", priority = 1 }
5454
unwrap_used = { level = "warn", priority = 1 }
55+
56+
[workspace.dependencies]
57+
actix = { version = "0.13", default-features = false }
58+
actix-files = "0.6"
59+
actix-http = "3.6"
60+
actix-multipart = "0.7"
61+
actix-rt = "2.9"
62+
actix-web = "4.5"
63+
actix-web-actors = "4.3"
64+
actix-web-httpauth = "0.8"
65+
aes-gcm = "0.10.3"
66+
anyhow = "1.0"
67+
approx = "0.5"
68+
arrow = "53.0"
69+
arrow-array = "53.0"
70+
arrow-ord = "53.0"
71+
arrow-schema = "53"
72+
aruna-rust-api = "2.0.0-beta.12"
73+
assert-json-diff = "2.0.2"
74+
assert_cmd = "2.0"
75+
async-stream = "0.3"
76+
async-trait = "0.1"
77+
base64 = "0.22"
78+
bb8-postgres = "0.8"
79+
bytes = "1.5"
80+
chrono = "0.4"
81+
config = "0.14"
82+
convert_case = "0.6.0"
83+
criterion = "0.5"
84+
csv = "1.3"
85+
derive_builder = "0.20"
86+
erased-serde = "0.4"
87+
fallible-iterator = "0.2"
88+
flexi_logger = "0.29"
89+
futures = "0.3"
90+
futures-util = "0.3"
91+
gdal = "0.17"
92+
gdal-sys = "0.10"
93+
geo = "0.29.1"
94+
geo-rand = { git = "https://github.com/lelongg/geo-rand", tag = "v0.3.0" }
95+
geojson = "0.24"
96+
httptest = "0.16.1"
97+
image = "0.25"
98+
itertools = "0.13"
99+
libloading = "0.8"
100+
log = "0.4"
101+
lru = "0.12"
102+
lz4_flex = "0.11"
103+
mime = "0.3"
104+
ndarray = "0.16"
105+
num = "0.4"
106+
num-traits = "0.2"
107+
oauth2 = "4.4.2"
108+
openidconnect = "3.4"
109+
opentelemetry = { version = "0.24", default-features = false }
110+
opentelemetry-otlp = "0.17"
111+
opentelemetry_sdk = "0.24"
112+
ordered-float = "4.2"
113+
ort = "2.0.0-rc.2"
114+
ouroboros = "0.18"
115+
paste = "1.0"
116+
pbkdf2 = "0.12.2"
117+
pest = "2.7"
118+
pest_derive = "2.7"
119+
pin-project = "1.1"
120+
postgres-protocol = "0.6.6"
121+
postgres-types = "0.2"
122+
pretty_assertions = "1.4"
123+
prettyplease = "0.2"
124+
proc-macro2 = "1.0"
125+
proj = "0.22"
126+
proj-sys = "0.19"
127+
prost = "0.12.3"
128+
pwhash = "1.0"
129+
quote = "1.0"
130+
rand = "0.8"
131+
rayon = "1.8"
132+
reqwest = "0.11"
133+
rustc-hash = { version = "2.0", default-features = false }
134+
serde = "1.0"
135+
serde_json = "1.0"
136+
serde_path_to_error = "0.1"
137+
serde_urlencoded = "0.7"
138+
serde_with = "3.6"
139+
serial_test = "3.0"
140+
sha2 = "0.10.8"
141+
snafu = "0.8"
142+
stac = "0.7"
143+
stream-cancel = "0.8"
144+
strum = "0.26"
145+
strum_macros = "0.26"
146+
syn = "2.0"
147+
tempfile = "3.10"
148+
time = "0.3"
149+
tokio = "1.36"
150+
tokio-postgres = "0.7"
151+
tonic = "0.11.0"
152+
tracing = "0.1"
153+
tracing-actix-web = "0.7"
154+
tracing-opentelemetry = "0.25"
155+
tracing-subscriber = "0.3"
156+
typetag = "0.2"
157+
url = "2.5"
158+
utoipa = "4.2"
159+
utoipa-swagger-ui = "7.1"
160+
uuid = "1.7"
161+
validator = "0.18"
162+
vergen = "9.0"
163+
vergen-gitcl = "1.0"
164+
walkdir = "2.4"
165+
wkt = "0.11"
166+
xml-rs = "0.8"
167+
zip = "2.1"
168+
float-cmp = "0.9.0"

datatypes/Cargo.toml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@ repository.workspace = true
1111
[features]
1212

1313
[dependencies]
14-
arrow = { version = "53.0", features = ["ipc_compression"] }
15-
arrow-array = "53.0"
16-
arrow-ord = "53.0"
17-
arrow-schema = { version = "53", features = ["serde"] }
18-
bytes = "1.5" # for postgres-types impls
19-
chrono = "0.4"
20-
fallible-iterator = "0.2" # only for postgres-protocol
21-
float-cmp = "0.9"
22-
gdal = "0.17"
23-
geo = "0.28"
24-
geojson = "0.24"
25-
image = "0.25"
26-
num = "0.4"
27-
num-traits = "0.2"
28-
ordered-float = { version = "4.2", features = ["serde"] }
29-
paste = "1.0"
30-
postgres-protocol = { version = "0.6" }
31-
postgres-types = { version = "0.2", features = [
14+
arrow = { workspace = true, features = ["ipc_compression"] }
15+
arrow-array = { workspace = true }
16+
arrow-ord = { workspace = true }
17+
arrow-schema = { workspace = true, features = ["serde"] }
18+
bytes = { workspace = true } # for postgres-types impls
19+
chrono = { workspace = true }
20+
fallible-iterator = { workspace = true } # only for postgres-protocol
21+
float-cmp = { workspace = true }
22+
gdal = { workspace = true }
23+
geo = { workspace = true }
24+
geojson = { workspace = true }
25+
image = { workspace = true }
26+
num = { workspace = true }
27+
num-traits = { workspace = true }
28+
ordered-float = { workspace = true, features = ["serde"] }
29+
paste = { workspace = true }
30+
postgres-protocol = { workspace = true }
31+
postgres-types = { workspace = true, features = [
3232
"array-impls",
3333
"derive",
3434
"with-chrono-0_4",
3535
"with-uuid-1",
3636
] }
37-
proj = "0.22" # needs to stay fixed to use fixed proj version
38-
rayon = "1.8"
39-
serde = { version = "1.0", features = ["derive"] }
40-
serde_json = "1.0"
41-
serde_with = "3.6"
42-
snafu = "0.8"
43-
uuid = { version = "1.7", features = ["serde", "v4", "v5"] }
44-
wkt = "0.11"
45-
strum = { version = "0.26", features = ["derive"] }
37+
proj = { workspace = true } # needs to stay fixed to use fixed proj version
38+
rayon = { workspace = true }
39+
serde = { workspace = true, features = ["derive"] }
40+
serde_json = { workspace = true }
41+
serde_with = { workspace = true }
42+
snafu = { workspace = true }
43+
uuid = { workspace = true, features = ["serde", "v4", "v5"] }
44+
wkt = { workspace = true }
45+
strum = { workspace = true, features = ["derive"] }
4646

4747
[dev-dependencies]
48-
criterion = "0.5"
49-
tempfile = "3.10"
48+
criterion = { workspace = true }
49+
tempfile = { workspace = true }
5050

5151
[[bench]]
5252
name = "multi_point_collection"

expression/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ repository.workspace = true
1010

1111
[dependencies]
1212
geoengine-expression-deps = { path = "deps-workspace" }
13-
libloading = "0.8"
14-
log = "0.4"
15-
pest = "2.7"
16-
pest_derive = "2.7"
17-
prettyplease = "0.2"
18-
proc-macro2 = "1.0"
19-
quote = "1.0"
20-
snafu = "0.8"
21-
syn = "2.0"
22-
tempfile = "3.10"
13+
libloading = { workspace = true }
14+
log = { workspace = true }
15+
pest = { workspace = true }
16+
pest_derive = { workspace = true }
17+
prettyplease = { workspace = true }
18+
proc-macro2 = { workspace = true }
19+
quote = { workspace = true }
20+
snafu = { workspace = true }
21+
syn = { workspace = true }
22+
tempfile = { workspace = true }
2323

2424
[dev-dependencies]
25-
geo = "0.28"
26-
pretty_assertions = "1.4"
25+
geo = { workspace = true }
26+
pretty_assertions = { workspace = true }
2727

2828
[lints]
2929
workspace = true

0 commit comments

Comments
 (0)