Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inherit Dependencies #91

Merged
merged 15 commits into from
Dec 4, 2023
Merged

Inherit Dependencies #91

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
284a494
Inherit dependencies from main `Cargo.toml` file.
Henry-Denny Nov 30, 2023
0068b15
Update file paths.
Henry-Denny Nov 30, 2023
c0b471e
Update Cargo.toml
Henry-Denny Nov 30, 2023
765e977
Update Cargo.toml
Henry-Denny Nov 30, 2023
a0ba14d
Update Cargo.toml
Henry-Denny Nov 30, 2023
92f2582
Undo autoformat.
Henry-Denny Nov 30, 2023
9a24351
Inherit all singleton dependencies.
Henry-Denny Nov 30, 2023
9bca2d3
Merge branch 'main' into inherit-dependencies
Henry-Denny Nov 30, 2023
a95c525
Prefix `supermusr-` and sort alphabetically.
Henry-Denny Nov 30, 2023
e5c35a3
Update package names.
Henry-Denny Dec 1, 2023
1a1c2b2
Update all references to `common`.
Henry-Denny Dec 1, 2023
b73df7c
Fix hyphens.
Henry-Denny Dec 4, 2023
7033afc
Update names.
Henry-Denny Dec 4, 2023
9670cdd
Sort imports alphabetically.
Henry-Denny Dec 4, 2023
dd16ba0
Revert alphabetical order for anti-example.
Henry-Denny Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ license = "GPL-3.0-only"
edition = "2021"

[workspace.dependencies]
common = { path = "./common" }
Henry-Denny marked this conversation as resolved.
Show resolved Hide resolved
streaming-types = { path = "./streaming-types" }
Henry-Denny marked this conversation as resolved.
Show resolved Hide resolved

Henry-Denny marked this conversation as resolved.
Show resolved Hide resolved
anyhow = "1.0"
chrono = "0.4.31"
clap = { version = "4.4", features = ["derive"] }
Expand All @@ -27,6 +30,11 @@ lazy_static = "1.4.0"
log = "0.4"
ndarray = "0.15.6"
ndarray-stats = "0.5.1"
rdkafka = { version = "0.31.0", features = ["cmake-build", "ssl", "gssapi", "sasl"] }
rdkafka = { version = "0.31.0", features = [
DanNixon marked this conversation as resolved.
Show resolved Hide resolved
"cmake-build",
"ssl",
"gssapi",
"sasl",
] }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1.33", features = ["macros", "rt-multi-thread"] }
4 changes: 2 additions & 2 deletions events-to-histogram/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

anyhow.workspace = true
clap.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions kafka-daq-report/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

anyhow.workspace = true
chrono.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions simulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

clap.workspace = true
chrono.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions stream-to-file/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

anyhow.workspace = true
chrono.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions trace-archiver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

anyhow.workspace = true
chrono.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions trace-to-events/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ license.workspace = true
edition.workspace = true

[dependencies]
common = { path = "../common" }
streaming-types = { path = "../streaming-types" }
common.workspace = true
streaming-types.workspace = true

anyhow.workspace = true
clap.workspace = true
Expand Down