maplibre/martin
1
1
Fork 0
mirror of https://github.com/maplibre/martin.git synced 2024-12-19 04:41:46 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7e20602079
martin/Cargo.toml

53 lines
1.6 KiB
TOML
Raw Normal View History

Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
[workspace]
Move Martin crate to its own subdir (#699) This cleans up the code a bit, making all crates to be on the same level.
2023-06-04 05:50:55 +03:00
members = ["martin", "martin-tile-utils", "martin-mbtiles"]
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
[workspace.package]
edition = "2021"
rust-version = "1.65"
repository = "https://github.com/maplibre/martin"
license = "MIT OR Apache-2.0"
[workspace.dependencies]
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
actix = "0.13"
actix-cors = "0.6"
actix-http = "3"
actix-rt = "2"
actix-web = "4"
Add `mbtiles meta-get` utility (#701) * Add functionality to retrieve a metadata value in an mbtiles file by key; simple implementation for one of the items in #667 * Also, disable TTY in docker-up `just` target
2023-06-03 03:40:22 +03:00
anyhow = "1.0"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
async-trait = "0.1"
fix (re-)compression of images (#579) Compression middleware turned out to be hard to use for image cases - it simply looks at the content-encoding, and if not set, tries to compress if accepted by the client. Instead, now individual routes are configured with either that middleware, or for tiles, I decompress and optionally recompress if applicable. Now encoding is tracked separately from the tile content, making it cleaner too. Plus lots of tests for mbtiles & pmtiles. Fixes #577
2023-02-20 18:44:22 +03:00
brotli = "3"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
Breakup config for pg and srv (#420) Getting ready for multi-backend system, where each backend would have its own configuration. All 3 config structs (clap args, config, and configbuilder) are now separated into 3 files - the main one, one for service (actix stuff), and one for PostgreSQL. The files have been moved to `/pg` and `/srv`, but otherwise the logic should be mostly intact.
2022-10-01 10:48:11 +03:00
clap = { version = "4", features = ["derive"] }
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
criterion = { version = "0.5", features = ["async_futures", "async_tokio", "html_reports"] }
ctor = "0.2"
Switch bb8 to DeadPool (#570) DeadPool seem to be better maintained, and most importantly, it properly reports connection errors - something bb8 does not support yet. I also removed connection timeout config param - it was introduced while trying to solve bb8 issue - not needed because connection string supports it already. This should resolve some of the issues in #496
2023-02-08 19:55:37 +03:00
deadpool-postgres = "0.10"
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"
Switch bb8 to DeadPool (#570) DeadPool seem to be better maintained, and most importantly, it properly reports connection errors - something bb8 does not support yet. I also removed connection timeout config param - it was introduced while trying to solve bb8 issue - not needed because connection string supports it already. This should resolve some of the issues in #496
2023-02-08 19:55:37 +03:00
flate2 = "1"
Multi-source support, new path structure (#456) Partial implementation of the #430 * New endpoint structure: * `GET /` -- a placeholder for the future home page * `GET /catalog` -- get a list of available sources, as a list of json blobs. * `[{id, name, description, attribution, vector_layer}, ...]` (some fields might be missing) * `GET /<id>` -- get tilejson for the given source, or a combination of sources. No `.json` extension * `GET /<id>/<z>/<x>/<y>` -- get a tile. No format extension. * `GET /health` -- healthcheck * Introduce a new tile format support crate (using code from the maplibre/mbtileserve project) * Removed the `/rpc/...` routes - all source IDs are accessed in the same way * Can print auto-generated configuration or save it to a file * Refactored to support multiple sources from multiple backends, with a proper naming conflict resolution TODO: * benchmarks need to be rewritten - they were relying on some internal structures that are no longer there. This might be done as a separate PR due to a very different internal architecture - might need to rethink benchmarking approaches.
2022-11-26 12:46:40 +03:00
futures = "0.3"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
indoc = "2"
chore: update dependencies (#226)
2021-07-16 16:08:46 +03:00
itertools = "0.10"
WIP: refactoring
2018-03-26 14:12:43 +03:00
log = "0.4"
Disable mbtiles default features, reserve keywords
2023-06-14 23:42:31 +03:00
martin-mbtiles = { path = "./martin-mbtiles", version = "0.2.0", default-features = false } # disable tools
Refactor mbtiles lib, mbtiles tool tests & CI (#702) * Broke up martin-mbtiles into multiple files * Made all mbtiles functions take a `SqliteExecutor` -- this way they can be used with any SQLX connection structs - either a pool connection or an individual non-pooled connection. * Simplified mbtiles bin a bit - I realized there is really no need to pretty print the output for the single value retrieval. Easier to just dump it to console as is. * Bump martin-mbtiles to v0.2.0 * Minor fixes in tools docs, cargo.toml, and justfile * MBTiles tool Integration tests and release publishing Major thanks to the [stackoverflow](https://stackoverflow.com/questions/76394665/how-to-pass-sqlx-connection-a-mut-trait-as-a-fn-parameter-in-rust/76395111) quick reply by @cafce25 on how to use generic sql executor!
2023-06-04 01:54:50 +03:00
martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" }
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
num_cpus = "1"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
openssl = "0.10"
Bump deps, prep v0.8.4 release
2023-05-25 19:01:35 +03:00
pmtiles = { version = "0.2.2", features = ["mmap-async-tokio", "tilejson"] }
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
postgis = "0.9"
cargo update (#395) * bump postgres features * update to latest
2022-09-13 09:18:01 +03:00
postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
postgres-openssl = "0.5"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
postgres-protocol = "0.6"
Improve SSL support (#567) This is a partial fix for #496 * BREAKING: Now Martin behaves the same way as `psql` -- by default, if SSL is available on the server, it will be used, even though it will not verify that the server has a valid SSL certificate * Martin now understands `PGSSLCERT`, `PGSSLKEY`, and `PGSSLROOTCERT` env vars (and corresponding config keys) - same as psql. * Martin can now process `?sslmode=verify-ca` and `verify-full` (just like psql). The verify modes require root and/or client cert & key. * remove `danger_accept_invalid_certs` -- turns out that behavior is expected by default unless ssl mode is set to verify - which upstream lib [does not support](https://github.com/sfackler/rust-postgres/issues/768) - PR [submitted](https://github.com/sfackler/rust-postgres/pull/988). * added connection_timeout_ms option for postgres and set it to 5 seconds by default. This way it will fail out earlier. * added error reporting to bb8 - but it is currently [broken upstream](https://github.com/djc/bb8/issues/151) - not sure we can fix it easily, so may need to switch to deadpool later. * added docker-based TLS test (horray!) - wasn't trivial at all, despite ending up fairly simple.
2023-02-06 22:32:28 +03:00
regex = "1"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
semver = "1"
Rework and consolidate CI (#467) Rework CI to run tests locally using the VM-installed Postgres on all target platforms. ### CI jobs * Build release versions on Linux/Win/Mac and save build results as output artifacts * In a separate VMs (Linux/Win/Mac) * use [nyurik/action-setup-postgis](https://github.com/nyurik/action-setup-postgis) to install postgis and run tests using the built artifacts * run `cargo test` on Linux only * copy built artifacts from the build step, and run tests using the release martin binary * package and publish if this is a release ### Other changes * Port some minor changes from the rewrite to porting easier * minor cleanups * remove all "expected" data files - too unstable to be usable
2022-10-31 23:28:21 +03:00
serde = { version = "1", features = ["derive"] }
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
serde_json = "1"
chore(deps): bump serde_yaml from 0.8.26 to 0.9.0 (#369) Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.26 to 0.9.0. - [Release notes](https://github.com/dtolnay/serde-yaml/releases) - [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.26...0.9.0) --- updated-dependencies: - dependency-name: serde_yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-29 12:20:49 +03:00
serde_yaml = "0.9"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
sqlx = { version = "0.6", features = ["offline", "sqlite", "runtime-actix-native-tls"] }
Implement multi-sourced postgres (#511) * Support `postgres` config key to be either a list or an object * Use `PathBuf` instead of `String` where dealing with files * Merge `SrvConfigBuilder` into `SrvConfig` * Parse keep_alive as u64 * More config tests
2022-12-22 09:35:29 +03:00
subst = { version = "0.2", features = ["yaml"] }
Strongly-type errors, fix bounds escaping (#516) * Since this is a library, all errors should have a strongly typed enum. * table bounds computing function was not escaping identifiers * table bounds computation was also silently ignoring all errors
2022-12-13 13:02:38 +03:00
thiserror = "1"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
tilejson = "0.3"
Add `mbtiles meta-get` utility (#701) * Add functionality to retrieve a metadata value in an mbtiles file by key; simple implementation for one of the items in #667 * Also, disable TTY in docker-up `just` target
2023-06-03 03:40:22 +03:00
tokio = { version = "1.28.2", features = ["macros"] }
Move Martin crate to its own subdir (#699) This cleans up the code a bit, making all crates to be on the same level.
2023-06-04 05:50:55 +03:00
[profile.dev.package.sqlx-macros]
# See https://github.com/launchbadge/sqlx#compile-time-verification
opt-level = 3
Reference in New Issue Copy Permalink