martin/Cargo.toml

59 lines
1.7 KiB
TOML
Raw Normal View History

[workspace]
resolver = "2"
members = ["martin", "martin-tile-utils", "martin-mbtiles"]
[workspace.package]
edition = "2021"
license = "MIT OR Apache-2.0"
2023-07-06 03:56:23 +03:00
repository = "https://github.com/maplibre/martin"
rust-version = "1.65"
readme = "README.md"
homepage = "https://martin.maplibre.org/"
[workspace.dependencies]
actix = "0.13"
actix-cors = "0.6"
actix-http = "3"
actix-rt = "2"
actix-web = "4"
anyhow = "1.0"
async-trait = "0.1"
brotli = "3"
cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
clap = { version = "4", features = ["derive"] }
criterion = { version = "0.5", features = ["async_futures", "async_tokio", "html_reports"] }
ctor = "0.2"
2023-09-26 21:24:56 +03:00
deadpool-postgres = "0.11"
chore(deps): bump env_logger from 0.9.3 to 0.10.0 (#493) [//]: # (dependabot-start) ⚠️ **Dependabot is rebasing this PR** ⚠️ Rebasing might not happen immediately, so don't worry if this takes some time. Note: if you make any changes to this PR yourself, they will take precedence over the rebase. --- [//]: # (dependabot-end) Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.9.3 to 0.10.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md">env_logger's changelog</a>.</em></p> <blockquote> <h2>[0.10.0] - 2022-11-24</h2> <p>MSRV changed to 1.60 to hide optional dependencies</p> <h3>Fixes</h3> <ul> <li>Resolved soundness issue by switching from <code>atty</code> to <code>is-terminal</code></li> </ul> <h3>Breaking Changes</h3> <p>To open room for changing dependencies:</p> <ul> <li>Renamed <code>termcolor</code> feature to <code>color</code></li> <li>Renamed <code>atty</code> feature to <code>auto-color</code></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/rust-cli/env_logger/commit/ff029fa8b6258ed926134f51d38ee85ebd553c35"><code>ff029fa</code></a> chore: Release</li> <li><a href="https://github.com/rust-cli/env_logger/commit/389cc52d5a14b45286c6478b00148abeaeccf4a7"><code>389cc52</code></a> docs: Fix changelog links</li> <li><a href="https://github.com/rust-cli/env_logger/commit/2979c4b7b8a42e0247dee69a513249976afcd1ed"><code>2979c4b</code></a> docs: Update changelog</li> <li><a href="https://github.com/rust-cli/env_logger/commit/4c379170f7824ac10eab9af52f5645ecae9214cd"><code>4c37917</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/248">#248</a> from epage/atty</li> <li><a href="https://github.com/rust-cli/env_logger/commit/d55d26980f338179e5d1829fb8d16b1d509530f1"><code>d55d269</code></a> style: Make clippy happy</li> <li><a href="https://github.com/rust-cli/env_logger/commit/066c2192c187f047ae178e786ff36e6cabed21f7"><code>066c219</code></a> fix: Replace atty with is_terminal</li> <li><a href="https://github.com/rust-cli/env_logger/commit/4db5e8793162e33e17efce36057afaa41d988788"><code>4db5e87</code></a> fix!: Rename termcolor/atty features</li> <li><a href="https://github.com/rust-cli/env_logger/commit/660cf7feb27e07bd308c3952637c5ae21c438846"><code>660cf7f</code></a> fix: Bump MSRV to 1.60.0</li> <li><a href="https://github.com/rust-cli/env_logger/commit/e572d048722c0af9c891df4ac8ef0716353c807d"><code>e572d04</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/244">#244</a> from epage/update</li> <li><a href="https://github.com/rust-cli/env_logger/commit/f1ff331fa2e3f1111cd918ba91b22ad5a7070777"><code>f1ff331</code></a> docs: Fix typos</li> <li>Additional commits viewable in <a href="https://github.com/rust-cli/env_logger/compare/v0.9.3...v0.10.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=env_logger&package-manager=cargo&previous-version=0.9.3&new-version=0.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-27 05:34:49 +03:00
env_logger = "0.10"
flate2 = "1"
futures = "0.3"
indoc = "2"
itertools = "0.11"
chore(deps): Bump json-patch from 1.0.0 to 1.1.0 (#876) Bumps [json-patch](https://github.com/idubrov/json-patch) from 1.0.0 to 1.1.0. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/idubrov/json-patch/commit/50a220ab4d2c3fea973c92a9d19135643f2b1270"><code>50a220a</code></a> chore: Release json-patch version 1.1.0</li> <li><a href="https://github.com/idubrov/json-patch/commit/d3a5a121bb25d8dcd6b2c237b573eedab2161c75"><code>d3a5a12</code></a> fix: tests and suggestion</li> <li><a href="https://github.com/idubrov/json-patch/commit/227dd997c3a9842871999224102e4496e64b011b"><code>227dd99</code></a> refactor: do not use recursion but keep a stack</li> <li><a href="https://github.com/idubrov/json-patch/commit/670981783d31f97796a5cf5008ba57df0985754d"><code>6709817</code></a> Updating codecov and fixing the test.</li> <li><a href="https://github.com/idubrov/json-patch/commit/0e1f7aab17359d03bf662b3fd28c32a98e6d5958"><code>0e1f7aa</code></a> Use utoipa support for serde_json::Value</li> <li>See full diff in <a href="https://github.com/idubrov/json-patch/compare/v1.0.0...v1.1.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=json-patch&package-manager=cargo&previous-version=1.0.0&new-version=1.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-12 18:03:26 +03:00
json-patch = "1.1"
2018-03-26 14:12:43 +03:00
log = "0.4"
martin-mbtiles = { path = "./martin-mbtiles", version = "0.5.0", default-features = false }
martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" }
num_cpus = "1"
openssl = "0.10"
pmtiles = { version = "0.3", features = ["mmap-async-tokio", "tilejson"] }
postgis = "0.9"
postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
postgres-openssl = "0.5"
postgres-protocol = "0.6"
regex = "1"
semver = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_yaml = "0.9"
Add dynamic sprites support (#715) Dynamically create image sprites for MapLibre rendering, given a directory with images. ### TODO * [x] Work with @flother to merge these PRs * [x] https://github.com/flother/spreet/pull/59 (must have) * [x] https://github.com/flother/spreet/pull/57 * [x] https://github.com/flother/spreet/pull/56 * [ ] https://github.com/flother/spreet/pull/62 (not required but nice to have, can upgrade later without any code changes) * [x] Add docs to the book * [x] Add CLI param, e.g. `--sprite <dir_path>` * [x] Don't output `.sprites` in auto-genned config when not in use ### API Per [MapLibre sprites API](https://maplibre.org/maplibre-style-spec/sprite/), we need to support the following: * `/sprite/<sprite_id>.json` metadata about the sprite file - all coming from a single directory * `/sprite/<sprite_id>.png` all images combined into a single PNG * `/sprite/<sprite_id>@2x.json` same but for high DPI devices * `/sprite/<sprite_id>@2x.png` Multiple sprite_id values can be combined into one sprite with the same pattern as for tile joining: `/sprite/<sprite_id1>,<sprite_id2>,...,<sprite_idN>[.json|.png|@2x.json|@2x.png]`. No ID renaming is done, so identical names will override one another. ### Configuration [Config file](https://maplibre.org/martin/config-file.html) and possibly CLI should have a simple option to serve sprites. The configuration may look similar to how mbtiles and pmtiles are configured: ```yaml # Publish sprite images sprites: paths: # scan this whole dir, matching all image files, and publishing it as "my_images" sprite source - /path/to/my_images sources: # named source matching source name to a directory my_sprites: /path/to/some_dir ``` Implement #705
2023-06-16 15:19:47 +03:00
spreet = { version = "0.8", default-features = false }
sqlite-hashes = "0.3"
sqlx = { version = "0.7", features = ["sqlite", "runtime-tokio"] }
2023-09-06 07:30:40 +03:00
subst = { version = "0.3", features = ["yaml"] }
thiserror = "1"
tilejson = "0.3"
chore(deps): Bump tokio from 1.31.0 to 1.32.0 (#818) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.31.0 to 1.32.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tokio-rs/tokio/releases">tokio's releases</a>.</em></p> <blockquote> <h2>Tokio v1.32.0</h2> <h3>Fixed</h3> <ul> <li>sync: fix potential quadradic behavior in <code>broadcast::Receiver</code> (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5925">#5925</a>)</li> </ul> <h3>Added</h3> <ul> <li>process: stabilize <code>Command::raw_arg</code> (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5930">#5930</a>)</li> <li>io: enable awaiting error readiness (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5781">#5781</a>)</li> </ul> <h3>Unstable</h3> <ul> <li>rt(alt): improve the scalability of alt runtime as the number of cores grows (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5935">#5935</a>)</li> </ul> <p><a href="https://redirect.github.com/tokio-rs/tokio/issues/5925">#5925</a>: <a href="https://redirect.github.com/tokio-rs/tokio/pull/5925">tokio-rs/tokio#5925</a> <a href="https://redirect.github.com/tokio-rs/tokio/issues/5930">#5930</a>: <a href="https://redirect.github.com/tokio-rs/tokio/pull/5930">tokio-rs/tokio#5930</a> <a href="https://redirect.github.com/tokio-rs/tokio/issues/5781">#5781</a>: <a href="https://redirect.github.com/tokio-rs/tokio/pull/5781">tokio-rs/tokio#5781</a> <a href="https://redirect.github.com/tokio-rs/tokio/issues/5935">#5935</a>: <a href="https://redirect.github.com/tokio-rs/tokio/pull/5935">tokio-rs/tokio#5935</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tokio-rs/tokio/commit/a7d52c2fede5ebd8f6e49d52a4af77138e0bd6e1"><code>a7d52c2</code></a> chore: prepare Tokio v1.32.0 release (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5937">#5937</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/f5f2b58b8dc6fcfb22d9c917d6c87410adab81e9"><code>f5f2b58</code></a> rt: improve docs for Builder::max_blocking_threads (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5793">#5793</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/718dcc8dff0262835c2972cf031bc2421398ffc6"><code>718dcc8</code></a> docs: BytesMut::with_capacity does not guarantee exact capacity (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5870">#5870</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/10e141d211526559190b97904508e3aee6c1fece"><code>10e141d</code></a> io: add <code>Ready::ERROR</code> and report error readiness (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5781">#5781</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/6e42c26c803e39ea92251487ddd50322b170c52d"><code>6e42c26</code></a> rt(alt): tweak some constants to improve scalability (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5935">#5935</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/82bef00db452a91382e6f122ac99726cda79a5bc"><code>82bef00</code></a> io: minor tweaks to <code>AsyncFd</code> (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5932">#5932</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/40633fc678251f7515d1d6429cbf4fe4aa59e37d"><code>40633fc</code></a> readme: list previous LTS releases (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5931">#5931</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/3dd5f7ae2e6e7bb78de4ffb6469b96603293d2bb"><code>3dd5f7a</code></a> sync: move broadcast waiters into separate list before waking (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5925">#5925</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/2c92cad9db3c3a30250b9d50e3e9dab88e6db42f"><code>2c92cad</code></a> process: stabilize <code>Command::raw_arg</code> (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5930">#5930</a>)</li> <li><a href="https://github.com/tokio-rs/tokio/commit/197757d44014639031726e3ea2b224ce750db7c4"><code>197757d</code></a> streams: create StreamMock for testing Streams (<a href="https://redirect.github.com/tokio-rs/tokio/issues/5915">#5915</a>)</li> <li>See full diff in <a href="https://github.com/tokio-rs/tokio/compare/tokio-1.31.0...tokio-1.32.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.31.0&new-version=1.32.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-17 07:14:40 +03:00
tokio = { version = "1.32.0", features = ["macros"] }
[profile.dev.package.sqlx-macros]
# See https://github.com/launchbadge/sqlx#compile-time-verification
opt-level = 3