greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Minor version adjustments and fixes.

Browse source
This commit is contained in:
Gregory Burd 2020-05-25 10:51:22 -04:00
parent bf1ac14d32
commit 5899bf8624
22 changed files with 155 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cargo.toml
View file

@ -14,7 +14,7 @@ authors = [
"Gregory Burd <greg@burd.me>", "Gregory Burd <greg@burd.me>",
] ]
name = "mentat" name = "mentat"
version = "0.11.2" version = "0.12.0"
build = "build/version.rs" build = "build/version.rs"
[features] [features]
@ -27,26 +27,25 @@ syncable = ["mentat_tolstoy", "tolstoy_traits", "mentat_db/syncable"]
members = ["tools/cli", "ffi"] members = ["tools/cli", "ffi"]
[build-dependencies] [build-dependencies]
rustc_version = "0.2" rustc_version = "~0.2"
[dev-dependencies.cargo-husky] [dev-dependencies.cargo-husky]
version = "1" version = "1"
default-features = false # Disable features which are enabled by default default-features = false # Disable features which are enabled by default
features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test", "run-cargo-check", "run-cargo-clippy"] features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test", "run-cargo-check", "run-cargo-clippy"]
# cargo audit #cargo audit
# cargo outdated #cargo outdated
[dependencies] [dependencies]
chrono = "0.4" chrono = "~0.4"
failure = "0.1" failure = "~0.1"
lazy_static = "1.4" lazy_static = "~1.4"
time = "0.2.15" time = "0.2.15"
log = "0.4" log = "~0.4"
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "~0.8", features = ["v4", "serde"] }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]

2
build/version.rs
View file

@ -14,7 +14,7 @@ use std::process::exit;
/// MIN_VERSION should be changed when there's a new minimum version of rustc required /// MIN_VERSION should be changed when there's a new minimum version of rustc required
/// to build the project. /// to build the project.
static MIN_VERSION: &str = "1.40.0"; static MIN_VERSION: &str = "1.43.0";
fn main() { fn main() {
let ver = version().unwrap(); let ver = version().unwrap();

18
core-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "core_traits" name = "core_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -8,14 +8,14 @@ name = "core_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "~0.4", features = ["serde"] }
enum-set = "0.0.8" enum-set = "~0.0.8"
lazy_static = "1.4" lazy_static = "~1.4"
indexmap = "1.3" indexmap = "~1.3"
ordered-float = { version = "1.0.2", features = ["serde"] } ordered-float = { version = "~1.0.2", features = ["serde"] }
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "~0.8", features = ["v4", "serde"] }
serde = { version = "1.0", features = ["rc"] } serde = { version = "~1.0", features = ["rc"] }
serde_derive = "1.0" serde_derive = "~1.0"
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

14
core/Cargo.toml
View file

@ -1,15 +1,15 @@
[package] [package]
name = "mentat_core" name = "mentat_core"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "~0.4", features = ["serde"] }
enum-set = "0.0" enum-set = "~0.0"
failure = "0.1" failure = "~0.1"
indexmap = "1.3" indexmap = "~1.3"
ordered-float = { version = "1.0", features = ["serde"] } ordered-float = { version = "~1.0", features = ["serde"] }
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "~0.8", features = ["v4", "serde"] }
[dependencies.core_traits] [dependencies.core_traits]
path = "../core-traits" path = "../core-traits"

8
db-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "db_traits" name = "db_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -11,8 +11,8 @@ path = "lib.rs"
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"
@ -21,5 +21,5 @@ path = "../edn"
path = "../core-traits" path = "../core-traits"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]

31
db/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "mentat_db" name = "mentat_db"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[features] [features]
@ -9,20 +9,20 @@ sqlcipher = ["rusqlite/sqlcipher"]
syncable = ["serde", "serde_json", "serde_derive"] syncable = ["serde", "serde_json", "serde_derive"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
indexmap = "1.3" indexmap = "~1.3"
itertools = "0.9" itertools = "~0.9"
lazy_static = "1.4" lazy_static = "~1.4"
log = "0.4" log = "~0.4"
ordered-float = "1.0" ordered-float = "~1.0"
time = "0.2" time = "~0.2"
petgraph = "0.5" petgraph = "~0.5"
serde = { version = "1.0", optional = true } serde = { version = "~1.0", optional = true }
serde_json = { version = "1.0", optional = true } serde_json = { version = "~1.0", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "~1.0", optional = true }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
@ -40,9 +40,10 @@ path = "../db-traits"
[dependencies.mentat_sql] [dependencies.mentat_sql]
path = "../sql" path = "../sql"
# Should be dev-dependencies. # TODO: This should be in dev-dependencies.
[dependencies.tabwriter] [dependencies.tabwriter]
version = "1.2.1" version = "~1.2"
[dev-dependencies] [dev-dependencies]
env_logger = "0.7" env_logger = "0.7"
#tabwriter = { version = "1.2.1" }

22
edn/Cargo.toml
View file

@ -10,19 +10,19 @@ description = "EDN parser for Project Mentat"
readme = "./README.md" readme = "./README.md"
[dependencies] [dependencies]
chrono = "0.4" chrono = "~0.4"
itertools = "0.9" itertools = "~0.9"
num = "0.2" num = "~0.2"
ordered-float = "1.0" ordered-float = "~1.0"
pretty = "0.10" pretty = "~0.10"
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "~0.8", features = ["v4", "serde"] }
serde = { version = "1.0", optional = true } serde = { version = "~1.0", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "~1.0", optional = true }
peg = "0.6" peg = "~0.6"
[dev-dependencies] [dev-dependencies]
serde_test = "1.0" serde_test = "~1.0"
serde_json = "1.0" serde_json = "~1.0"
[features] [features]
serde_support = ["serde", "serde_derive"] serde_support = ["serde", "serde_derive"]

4
ffi/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "mentat_ffi" name = "mentat_ffi"
version = "0.0.1" version = "0.0.2"
authors = ["Emily Toop <etoop@mozilla.com>"] authors = ["Emily Toop <etoop@mozilla.com>"]
[lib] [lib]
@ -13,7 +13,7 @@ sqlcipher = ["mentat/sqlcipher"]
bundled_sqlite3 = ["mentat/bundled_sqlite3"] bundled_sqlite3 = ["mentat/bundled_sqlite3"]
[dependencies] [dependencies]
libc = "0.2" libc = "~0.2"
[dependencies.mentat] [dependencies.mentat]
path = "../" path = "../"

30
public-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "public_traits" name = "public_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -13,16 +13,24 @@ sqlcipher = ["rusqlite/sqlcipher"]
syncable = ["tolstoy_traits", "hyper", "serde_json"] syncable = ["tolstoy_traits", "hyper", "serde_json"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
http = "0.2" http = "~0.2"
tokio-core = "0.1" tokio-core = "~0.1"
uuid = "0.8" uuid = "~0.8"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.hyper]
version = "~0.13"
optional = true
[dependencies.serde_json]
version = "~1.0"
optional = true
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"
@ -47,11 +55,3 @@ path = "../sql-traits"
[dependencies.tolstoy_traits] [dependencies.tolstoy_traits]
path = "../tolstoy-traits" path = "../tolstoy-traits"
optional = true optional = true
[dependencies.hyper]
version = "0.13"
optional = true
[dependencies.serde_json]
version = "1.0"
optional = true

6
query-algebrizer-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "query_algebrizer_traits" name = "query_algebrizer_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -8,8 +8,8 @@ name = "query_algebrizer_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

6
query-algebrizer/Cargo.toml
View file

@ -1,10 +1,10 @@
[package] [package]
name = "mentat_query_algebrizer" name = "mentat_query_algebrizer"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"
@ -19,4 +19,4 @@ path = "../core-traits"
path = "../query-algebrizer-traits" path = "../query-algebrizer-traits"
[dev-dependencies] [dev-dependencies]
itertools = "0.9" itertools = "~0.9"

8
query-projector-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "query_projector_traits" name = "query_projector_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -11,11 +11,11 @@ path = "lib.rs"
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]

8
query-projector/Cargo.toml
View file

@ -1,17 +1,17 @@
[package] [package]
name = "mentat_query_projector" name = "mentat_query_projector"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[features] [features]
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
indexmap = "1.3" indexmap = "~1.3"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.core_traits] [dependencies.core_traits]

6
query-pull-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "query_pull_traits" name = "query_pull_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -8,8 +8,8 @@ name = "query_pull_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
[dependencies.core_traits] [dependencies.core_traits]
path = "../core-traits" path = "../core-traits"

6
query-pull/Cargo.toml
View file

@ -1,19 +1,19 @@
[package] [package]
name = "mentat_query_pull" name = "mentat_query_pull"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[features] [features]
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
[dependencies.query_pull_traits] [dependencies.query_pull_traits]
path = "../query-pull-traits" path = "../query-pull-traits"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]

4
query-sql/Cargo.toml
View file

@ -1,10 +1,10 @@
[package] [package]
name = "mentat_query_sql" name = "mentat_query_sql"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]

6
sql-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "sql_traits" name = "sql_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -8,5 +8,5 @@ name = "sql_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
failure = "0.1.1" failure = "~0.1"
failure_derive = "0.1.1" failure_derive = "~0.1"

8
sql/Cargo.toml
View file

@ -1,17 +1,17 @@
[package] [package]
name = "mentat_sql" name = "mentat_sql"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[features] [features]
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
ordered-float = "1.0" ordered-float = "~1.0"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.core_traits] [dependencies.core_traits]

22
tolstoy-traits/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tolstoy_traits" name = "tolstoy_traits"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[lib] [lib]
@ -11,16 +11,16 @@ path = "lib.rs"
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
http = "0.2" http = "~0.2"
hyper = "0.13" hyper = "~0.13"
serde_json = "1.0" serde_json = "~1.0"
uuid = { version = "0.8" } uuid = { version = "~0.8" }
[dependencies.rusqlite]
version = "~0.23"
features = ["limits", "bundled"]
[dependencies.db_traits] [dependencies.db_traits]
path = "../db-traits" path = "../db-traits"
[dependencies.rusqlite]
version = "0.23"
features = ["limits", "bundled"]

38
tolstoy/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
edition = "2018" edition = "2018"
name = "mentat_tolstoy" name = "mentat_tolstoy"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
authors = ["Grisha Kruglov <gkruglov@mozilla.com>"] authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
@ -9,21 +9,25 @@ authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
futures = "0.3" futures = "~0.3"
hyper = "0.13" hyper = "~0.13"
hyper-tls = "0.4" hyper-tls = "~0.4"
http = "0.2" http = "~0.2"
log = "0.4" log = "~0.4"
mime = "0.3" mime = "~0.3"
#tokio = { version = "0.2", features = ["full"] } #tokio = { version = "0.2", features = ["full"] }
tokio-core = "0.1" tokio-core = "~0.1"
serde = "1.0" serde = "~1.0"
serde_json = "1.0" serde_json = "~1.0"
serde_cbor = "0.11" serde_cbor = "~0.11"
serde_derive = "1.0" serde_derive = "~1.0"
lazy_static = "1.4" lazy_static = "~1.4"
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "~0.8", features = ["v4", "serde"] }
[dependencies.rusqlite]
version = "~0.23"
features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"
@ -49,7 +53,3 @@ path = "../public-traits"
[dependencies.mentat_transaction] [dependencies.mentat_transaction]
path = "../transaction" path = "../transaction"
[dependencies.rusqlite]
version = "0.23"
features = ["limits", "bundled"]

30
tools/cli/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "mentat_cli" name = "mentat_cli"
version = "0.0.1" version = "0.0.2"
# Forward mentat's features. # Forward mentat's features.
[features] [features]
@ -19,22 +19,22 @@ doc = false
test = false test = false
[dependencies] [dependencies]
combine = "4.0" combine = "~4.2"
dirs = "2.0" dirs = "~2.0"
env_logger = "0.7" env_logger = "~0.7"
failure = "0.1" failure = "~0.1"
failure_derive = "0.1" failure_derive = "~0.1"
getopts = "0.2" getopts = "~0.2"
lazy_static = "1.4" lazy_static = "~1.4"
linefeed = "0.6" linefeed = "~0.6"
log = "0.4" log = "~0.4"
tabwriter = "1" tabwriter = "~1.2"
tempfile = "3.1" tempfile = "~3.1"
termion = "1.5" termion = "~1.5"
time = "0.2" time = "~0.2"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.23" version = "~0.23"
features = ["limits", "bundled"] features = ["limits", "bundled"]
[dependencies.mentat] [dependencies.mentat]

12
transaction/Cargo.toml
View file

@ -1,13 +1,17 @@
[package] [package]
name = "mentat_transaction" name = "mentat_transaction"
version = "0.0.1" version = "0.0.2"
workspace = ".." workspace = ".."
[features] [features]
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1" failure = "~0.1"
[dependencies.rusqlite]
version = "~0.23"
features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"
@ -41,7 +45,3 @@ path = "../query-pull"
[dependencies.mentat_query_sql] [dependencies.mentat_query_sql]
path = "../query-sql" path = "../query-sql"
[dependencies.rusqlite]
version = "0.23"
features = ["limits", "bundled"]