differential is a workspace dep

antiguru · antiguru · commit b75307c80bc5 · 2025-02-20T08:50:53.000+01:00
Signed-off-by: Moritz Hoffmann &lt;antiguru@gmail.com&gt;
diff --git a/.travis.yml b/.travis.yml
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
+differential-dataflow = { path = "differential-dataflow", default-features = false, version = "0.13.6" }
 timely = { version = "0.18", default-features = false }
 #timely = { path = "../timely-dataflow/timely/", default-features = false }
 
diff --git a/advent_of_code_2017/Cargo.toml b/advent_of_code_2017/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Frank McSherry <fmcsherry@me.com>"]
 publish = false
 
 [dependencies]
-differential-dataflow = { path = "../differential-dataflow" }
+differential-dataflow = { workspace = true }
 timely = { git = "https://github.com/frankmcsherry/timely-dataflow" }
diff --git a/differential-dataflow/Cargo.toml b/differential-dataflow/Cargo.toml
@@ -12,7 +12,7 @@ homepage = "https://github.com/TimelyDataflow/differential-dataflow"
 repository = "https://github.com/TimelyDataflow/differential-dataflow.git"
 keywords = ["differential", "dataflow"]
 license = "MIT"
-readme = "README.md"
+readme = "../README.md"
 edition="2021"
 
 [dev-dependencies]
diff --git a/dogsdogsdogs/Cargo.toml b/dogsdogsdogs/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/TimelyDataflow/differential-dataflow.git"
 
 [dependencies]
 timely = { workspace = true }
-differential-dataflow = { path = "../differential-dataflow", default-features = false, version = "0.13.6" }
+differential-dataflow = { workspace = true }
 serde = { version = "1.0", features = ["derive"]}
 
 [dev-dependencies]
diff --git a/doop/Cargo.toml b/doop/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 [dependencies]
 indexmap = "2.1"
 timely = {workspace = true}
-differential-dataflow = { path = "../differential-dataflow" }
+differential-dataflow = { workspace = true }
diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 core_affinity = "0.5.9"
 rand="0.3.13"
 timely = { workspace = true }
-differential-dataflow = { path = "../differential-dataflow" }
+differential-dataflow = { workspace = true }
 graph_map = { git = "https://github.com/frankmcsherry/graph-map" }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/interactive/Cargo.toml b/interactive/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 [dependencies]
 bincode = "1"
 serde = { version = "1", features = ["derive"]}
-differential-dataflow = { path = "../differential-dataflow" }
+differential-dataflow = { workspace = true }
 differential-dogs3 = { path = "../dogsdogsdogs" }
 timely = { workspace = true }
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -6,15 +6,6 @@ edition = "2021"
 publish = false
 
 [dependencies]
-rand="0.3.13"
-libloading="*"
-differential-dataflow = { path = "../differential-dataflow" }
+libloading = "0.8"
+differential-dataflow = { workspace = true }
 timely = { workspace = true }
-
-#[workspace]
-#members = [
-#    "dataflows/random_graph",
-#    "dataflows/degr_dist",
-#    "dataflows/neighborhood",
-#    "dataflows/reachability"
-#]
diff --git a/server/dataflows/degr_dist/.gitignore b/server/dataflows/degr_dist/.gitignore
diff --git a/server/dataflows/degr_dist/Cargo.toml b/server/dataflows/degr_dist/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 timely = { workspace = true }
-differential-dataflow = { path = "../../../differential-dataflow" }
+differential-dataflow = { workspace = true }
 dd_server = { path = "../../" }
 
 [lib]
diff --git a/server/dataflows/neighborhood/.gitignore b/server/dataflows/neighborhood/.gitignore
diff --git a/server/dataflows/neighborhood/Cargo.toml b/server/dataflows/neighborhood/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-differential-dataflow = { path = "../../../differential-dataflow" }
+differential-dataflow = { workspace = true }
 dd_server = { path = "../../" }
 
 [lib]
diff --git a/server/dataflows/random_graph/.gitignore b/server/dataflows/random_graph/.gitignore
diff --git a/server/dataflows/random_graph/Cargo.toml b/server/dataflows/random_graph/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 timely = {workspace = true}
-differential-dataflow = { path = "../../../differential-dataflow" }
+differential-dataflow = { workspace = true }
 dd_server = { path = "../../" }
 rand="0.3.13"
 
diff --git a/server/dataflows/reachability/.gitignore b/server/dataflows/reachability/.gitignore
diff --git a/server/dataflows/reachability/Cargo.toml b/server/dataflows/reachability/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-differential-dataflow = { path = "../../../differential-dataflow" }
+differential-dataflow = { workspace = true }
 dd_server = { path = "../../" }
 
 [lib]
diff --git a/server/src/bin/dd_server.rs b/server/src/bin/dd_server.rs
diff --git a/tpchlike/Cargo.toml b/tpchlike/Cargo.toml
@@ -8,7 +8,7 @@ rand = "0.6.5"
 regex = "0.2"
 #timely = "0.11"
 timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
-differential-dataflow = { path = "../differential-dataflow" }
+differential-dataflow = { workspace = true }
 arrayvec = { git = "https://github.com/bluss/arrayvec" }
 abomonation = "0.7"
 core_affinity = "0.5.9"
