Skip to content

Commit 9395110

Browse files
chore(core): minimise the dependedncy Postgres needs for both core and non-core (#2194)
to simplify development, previously both core and non-core had the same dependencys listed. We can remove a few dependencys from the core/non-core build and move them to the correct place
1 parent f8934d6 commit 9395110

3 files changed

Lines changed: 2 additions & 36 deletions

File tree

Cargo.lock

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

martin-core/Cargo.toml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ homepage.workspace = true
1515
default = ["fonts", "styles", "sprites", "mbtiles", "pmtiles", "cog", "postgres"]
1616
postgres = [
1717
"dep:deadpool-postgres",
18-
"dep:enum-display",
19-
"dep:json-patch",
20-
"dep:postgis",
2118
"dep:postgres",
22-
"dep:postgres-protocol",
2319
"dep:regex",
20+
"dep:rustls",
2421
"dep:rustls-native-certs",
2522
"dep:rustls-pemfile",
26-
"dep:rustls",
2723
"dep:semver",
2824
"dep:tokio-postgres-rustls",
2925
"dep:serde_json",
@@ -53,20 +49,16 @@ aws-config = { workspace = true, optional = true }
5349
bit-set = { workspace = true, optional = true }
5450
dashmap = { workspace = true, optional = true }
5551
deadpool-postgres = { workspace = true, optional = true }
56-
enum-display = { workspace = true, optional = true }
5752
futures = { workspace = true, optional = true }
5853
itertools = { workspace = true, optional = true }
59-
json-patch = { workspace = true, optional = true }
6054
log.workspace = true
6155
martin-tile-utils.workspace = true
6256
mbtiles = { workspace = true, optional = true }
6357
moka.workspace = true
6458
pbf_font_tools = { workspace = true, optional = true }
6559
pmtiles = { workspace = true, optional = true }
6660
png = { workspace = true, optional = true }
67-
postgis = { workspace = true, optional = true }
6861
postgres = { workspace = true, optional = true }
69-
postgres-protocol = { workspace = true, optional = true }
7062
regex = { workspace = true, optional = true }
7163
rustls = { workspace = true, optional = true }
7264
rustls-native-certs = { workspace = true, optional = true }

martin/Cargo.toml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,11 @@ mbtiles = ["martin-core/mbtiles"]
9999
metrics = ["dep:actix-web-prom"]
100100
pmtiles = ["martin-core/pmtiles"]
101101
postgres = [
102-
"dep:deadpool-postgres",
102+
"martin-core/postgres",
103103
"dep:enum-display",
104104
"dep:json-patch",
105105
"dep:postgis",
106-
"dep:postgres",
107106
"dep:postgres-protocol",
108-
"dep:regex",
109-
"dep:rustls-native-certs",
110-
"dep:rustls-pemfile",
111-
"dep:semver",
112-
"dep:tokio-postgres-rustls",
113-
"martin-core/postgres",
114107
]
115108
sprites = ["martin-core/sprites"]
116109
styles = ["martin-core/styles", "dep:walkdir"]
@@ -127,7 +120,6 @@ actix-web-static-files = { workspace = true, optional = true }
127120
async-trait.workspace = true
128121
clap.workspace = true
129122
dashmap.workspace = true
130-
deadpool-postgres = { workspace = true, optional = true }
131123
enum-display = { workspace = true, optional = true }
132124
env_logger.workspace = true
133125
futures.workspace = true
@@ -139,15 +131,9 @@ martin-core.workspace = true
139131
martin-tile-utils.workspace = true
140132
mbtiles.workspace = true
141133
num_cpus.workspace = true
142-
143134
postgis = { workspace = true, optional = true }
144-
postgres = { workspace = true, optional = true }
145135
postgres-protocol = { workspace = true, optional = true }
146-
regex = { workspace = true, optional = true }
147136
rustls.workspace = true
148-
rustls-native-certs = { workspace = true, optional = true }
149-
rustls-pemfile = { workspace = true, optional = true }
150-
semver = { workspace = true, optional = true }
151137
serde.workspace = true
152138
serde_json.workspace = true
153139
serde_with.workspace = true
@@ -158,7 +144,6 @@ thiserror.workspace = true
158144
tiff = { workspace = true, optional = true }
159145
tilejson.workspace = true
160146
tokio = { workspace = true, features = ["io-std"] }
161-
tokio-postgres-rustls = { workspace = true, optional = true }
162147
url.workspace = true
163148
walkdir = { workspace = true, optional = true }
164149
xxhash-rust.workspace = true

0 commit comments

Comments
 (0)