Skip to content

Commit

Permalink
Prepare Release v0.11.6
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Wahl <mwahl@wayfair.com>
  • Loading branch information
Matthias Wahl authored and mfelsche committed Sep 16, 2021
1 parent 8c0f5a9 commit 074f664
Show file tree
Hide file tree
Showing 11 changed files with 125 additions and 81 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

## 0.11.6
### Fixes

- Fix possible memory unsafety issue when using patch or merge on `state` [#1217](https://github.com/tremor-rs/tremor-runtime/pull/1217).
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 80 additions & 37 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "Apache-2.0"
name = "tremor-runtime"
readme = "README.md"
repository = "https://github.com/tremor-rs/tremor-runtime"
version = "0.11.5"
version = "0.11.6"

[workspace]

Expand All @@ -32,13 +32,22 @@ opt-level = 3
anyhow = "1"
async-channel = "1"
async-compat = "0.2"
async-compression = {version = "0.3", features = ["xz", "futures-bufread", "stream"]}
async-std = {version = "1.9.0", features = ["unstable", "attributes", "tokio03", "tokio1"]}
async-compression = { version = "0.3", features = [
"xz",
"futures-bufread",
"stream",
] }
async-std = { version = "1.9.0", features = [
"unstable",
"attributes",
"tokio03",
"tokio1",
] }
async-std-resolver = "0.20"
async-trait = "0.1"
async-tungstenite = {version = "0.13.1", features = ["async-std-runtime"]}
async-tungstenite = { version = "0.13.1", features = ["async-std-runtime"] }
base64 = "0.13"
beef = {version = "0.5", features = ["impl_serde"]}
beef = { version = "0.5", features = ["impl_serde"] }
byteorder = "1"
bytes = "1.0"
chrono = "0.4"
Expand All @@ -47,10 +56,10 @@ error-chain = "0.12"
futures = "0.3.15"
glob = "0.3"
halfbrown = "0.1"
hashbrown = {version = "0.11", features = ["serde"]}
hashbrown = { version = "0.11", features = ["serde"] }
hostname = "0.3"
http-types = "2.11"
indexmap = {version = "1", features = ["serde-1"]}
indexmap = { version = "1", features = ["serde-1"] }
lapin = "1.7.1"
lazy_static = "1"
libflate = "1.1"
Expand All @@ -65,34 +74,43 @@ rmp-serde = "0.15"
serde = "1"
serde_derive = "1"
serde_yaml = "0.8"
simd-json = {version = "0.4", features = ["known-key"]}
simd-json = { version = "0.4", features = ["known-key"] }
simd-json-derive = "0.2"
snap = "1"
surf = "=2.2.0"
syslog_loose = "0.10"
tremor-common = {path = "tremor-common"}
tremor-influx = {path = "tremor-influx"}
tremor-pipeline = {path = "tremor-pipeline"}
tremor-script = {path = "tremor-script"}
tremor-value = {path = "tremor-value"}
tremor-common = { path = "tremor-common" }
tremor-influx = { path = "tremor-influx" }
tremor-pipeline = { path = "tremor-pipeline" }
tremor-script = { path = "tremor-script" }
tremor-value = { path = "tremor-value" }
url = "2.2"
value-trait = "0.2"

mapr = "0.8"
tempfile = {version = "3.2"}
tempfile = { version = "3.2" }

# blaster / blackhole
hdrhistogram = "7"
xz2 = "0.1"

# postgres
postgres = {version = "0.19", features = ["with-serde_json-1", "with-chrono-0_4"]}
postgres = { version = "0.19", features = [
"with-serde_json-1",
"with-chrono-0_4",
] }
postgres-protocol = "0.6"
tokio-postgres = "0.7"

# kafka. cmake is the encouraged way to build this and also the one that works on windows/with musl.
rdkafka = {version = "0.24", features = ["cmake-build", "libz-static"], default-features = false}
rdkafka-sys = {version = "2.0.0", features = ["cmake-build", "libz-static"]}# tracking the version rdkafka depends on
rdkafka = { version = "0.24", features = [
"cmake-build",
"libz-static",
], default-features = false }
rdkafka-sys = { version = "2.0.0", features = [
"cmake-build",
"libz-static",
] } # tracking the version rdkafka depends on
smol = "1.2.5"

# crononome
Expand All @@ -103,7 +121,7 @@ grok = "1"

# not used directly in tremor codebase, but present here so that we can turn
# on features for these (see static-ssl feature here)
openssl = {version = "0.10", features = ["vendored"]}
openssl = { version = "0.10", features = ["vendored"] }

# rest onramp
tide = "0.16"
Expand All @@ -112,25 +130,30 @@ tide = "0.16"
async-nats = "0.9.17"

# discord
serenity = {version = "0.10", default-features = false, features = [
serenity = { version = "0.10", default-features = false, features = [
"client",
"gateway",
"rustls_backend",
"model",
"cache",
]}
] }

# kv
sled = "0.34"

# opentelemetry
port_scanner = "0.1.5"
tonic = {version = "0.4", default-features = false, features = ["transport", "tls"]}
tonic = { version = "0.4", default-features = false, features = [
"transport",
"tls",
] }
tremor-otelapis = "0.1"

# gcp
googapis = {version = "0.4.2", default-features = false, features = ["google-pubsub-v1"]}
gouth = {version = "0.2"}
googapis = { version = "0.4.2", default-features = false, features = [
"google-pubsub-v1",
] }
gouth = { version = "0.2" }
http = "0.2.4"
reqwest = "0.11.3"

Expand All @@ -155,8 +178,8 @@ default = []
bert = ["tremor-pipeline/bert"]

[patch.crates-io]
rust-bert = {git = 'https://github.com/mfelsche/rust-bert.git', rev = '1140989'}
rust_tokenizers = {git = 'https://github.com/mfelsche/rust-tokenizers.git', rev = '5a7860d'}
rust-bert = { git = 'https://github.com/mfelsche/rust-bert.git', rev = '1140989' }
rust_tokenizers = { git = 'https://github.com/mfelsche/rust-tokenizers.git', rev = '5a7860d' }

# for use during debian packaging, via cargo-deb
# https://github.com/mmstick/cargo-deb#packagemetadatadeb-options
Expand All @@ -165,10 +188,26 @@ name = "tremor"
section = "net"
# keep this in sync with the rpm dependencies (in rpm spec file)
assets = [
["target/release/tremor", "/usr/bin/", "755"],
["README.md", "/usr/share/doc/tremor/", "644"],
["LICENSE", "/usr/share/doc/tremor/", "644"],
["packaging/distribution/etc/tremor/*", "/etc/tremor/", "644"],
[
"target/release/tremor",
"/usr/bin/",
"755",
],
[
"README.md",
"/usr/share/doc/tremor/",
"644",
],
[
"LICENSE",
"/usr/share/doc/tremor/",
"644",
],
[
"packaging/distribution/etc/tremor/*",
"/etc/tremor/",
"644",
],
[
"packaging/distribution/etc/tremor/config/*",
"/etc/tremor/config/",
Expand All @@ -179,7 +218,11 @@ assets = [
"/usr/share/tremor/",
"755",
],
["tremor-script/lib/**/*", "/usr/share/tremor/lib", "644"],
[
"tremor-script/lib/**/*",
"/usr/share/tremor/lib",
"644",
],
[
"packaging/distribution/etc/systemd/system/*",
"/lib/systemd/system/",
Expand Down Expand Up @@ -207,17 +250,17 @@ package = "tremor"
buildflags = ["--release"]
profile = "release"
[package.metadata.rpm.targets]
tremor = {path = "/usr/bin/tremor"}
tremor = { path = "/usr/bin/tremor" }
# The LHS paths here are relative to the rpm config dir (.rpm at project root).
# If you add new files here, please make sure to add them to %files section in
# the rpm spec file (inside .rpm) -- otherwise the rpm packaging will fail.
[package.metadata.rpm.files]
"../LICENSE" = {path = "/usr/share/licenses/tremor/LICENSE"}
"../README.md" = {path = "/usr/share/doc/tremor/README.md"}
"../packaging/distribution/etc/tremor/" = {path = "/etc/tremor/"}
"../LICENSE" = { path = "/usr/share/licenses/tremor/LICENSE" }
"../README.md" = { path = "/usr/share/doc/tremor/README.md" }
"../packaging/distribution/etc/tremor/" = { path = "/etc/tremor/" }
# TODO enable this after some example cleanup
#"../demo/examples/" = { path = "/etc/tremor/config/examples/" }
"../packaging/distribution/usr/share/tremor/tremor.sh" = {path = "/usr/share/tremor/tremor.sh", mode = "755"}
"../tremor-script/lib/" = {path = "/usr/share/tremor/lib/"}
"../packaging/distribution/usr/share/tremor/tremor.sh" = { path = "/usr/share/tremor/tremor.sh", mode = "755" }
"../tremor-script/lib/" = { path = "/usr/share/tremor/lib/" }
# copying systemd service to standard location for rpm packages
"../packaging/distribution/etc/systemd/system/tremor.service" = {path = "/usr/lib/systemd/system/tremor.service"}
"../packaging/distribution/etc/systemd/system/tremor.service" = { path = "/usr/lib/systemd/system/tremor.service" }
2 changes: 1 addition & 1 deletion Dockerfile.learn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM rust:1.52.1 as builder

RUN cargo install --features=ssl websocat

FROM tremorproject/tremor:0.11.5
FROM tremorproject/tremor:0.11.6

COPY --from=builder /usr/local/cargo/bin/websocat /usr/local/bin/websocat

Expand Down
10 changes: 5 additions & 5 deletions tremor-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ description = "Tremor Api Callbacks"
edition = "2018"
license = "Apache-2.0"
name = "tremor-api"
version = "0.11.5"
version = "0.11.6"

[dependencies]
hashbrown = {version = "0.11", features = ["serde"]}
hashbrown = { version = "0.11", features = ["serde"] }
http-types = "2.11"
serde = "1"
serde_derive = "1"
serde_yaml = "0.8"
simd-json = "0.4"
tide = "0.16"
tremor-pipeline = {path = "../tremor-pipeline"}
tremor-runtime = {path = "../"}
tremor-script = {path = "../tremor-script"}
tremor-pipeline = { path = "../tremor-pipeline" }
tremor-runtime = { path = "../" }
tremor-script = { path = "../tremor-script" }
24 changes: 12 additions & 12 deletions tremor-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "Tremor CLI Tool"
edition = "2018"
license = "Apache-2.0"
name = "tremor-cli"
version = "0.11.5"
version = "0.11.6"

[package.metadata.docs.rs]
default-target = "x86_64-unknown-linux-gnu"
Expand All @@ -21,8 +21,8 @@ pretty_assertions = "0.7.2"

[dependencies]
anyhow = "1"
async-std = {version = "1.9", features = ["unstable"]}
clap = {version = "3.0.0-beta.2", features = ["yaml", "color"]}
async-std = { version = "1.9", features = ["unstable"] }
clap = { version = "3.0.0-beta.2", features = ["yaml", "color"] }
clap_generate = "3.0.0-beta.2"
difference = "2"
dirs-next = "2"
Expand All @@ -35,21 +35,21 @@ log4rs = "1.0.0"
serde = "1"
serde_derive = "1"
serde_yaml = "0.8"
simd-json = {version = "0.4", features = ["known-key"]}
simd-json = { version = "0.4", features = ["known-key"] }
# we need to stick with 0.2.26 as it includes its own libc
# which allows us to build on older systems like centos 7
# issues to track until we can loosen those restrictions:
# - https://github.com/microsoft/snmalloc/issues/328
# - https://github.com/SchrodingerZhu/snmalloc-rs/issues/145
snmalloc-rs = {version = "=0.2.26", optional = false}
snmalloc-sys = {version = "=0.2.26", optional = false}
snmalloc-rs = { version = "=0.2.26", optional = false }
snmalloc-sys = { version = "=0.2.26", optional = false }
surf = "=2.2.0"
tide = "0.16"
tremor-api = {path = "../tremor-api"}
tremor-common = {path = "../tremor-common"}
tremor-pipeline = {path = "../tremor-pipeline"}
tremor-runtime = {path = "../"}
tremor-script = {path = "../tremor-script"}
tremor-api = { path = "../tremor-api" }
tremor-common = { path = "../tremor-common" }
tremor-pipeline = { path = "../tremor-pipeline" }
tremor-runtime = { path = "../" }
tremor-script = { path = "../tremor-script" }
url = "2"
# mimalloc-rs = { version = "0.1", default-features = true, optional = true }
# allocator_api = "0.6.0"
Expand All @@ -59,7 +59,7 @@ port_scanner = "0.1"
rental = "0.5"
serde_json = "1.0"
shell-words = "1.0"
tch = {version = "*", optional = true}
tch = { version = "*", optional = true }
termcolor = "1.1"
[[bin]]
name = "tremor"
Expand Down
2 changes: 1 addition & 1 deletion tremor-cli/tests/api-cli/command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ suites:
expects:
- source: stdout
contains:
- '{"version":"0.11.5"}'
- '{"version":"0.11.6"}'
- name: GET /onramp
command: tremor api -f json onramp list
tags:
Expand Down
2 changes: 1 addition & 1 deletion tremor-cli/tests/api/command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ suites:
- source: stdout
contains:
- HTTP/1.1 200 OK
- '{"version":"0.11.5"'
- '{"version":"0.11.6"'
- name: GET /onramp
command: curl -vs --stderr - http://localhost:9898/onramp
tags:
Expand Down
Loading

0 comments on commit 074f664

Please sign in to comment.