From 65c2a22f6f50239d9dba850de5ec517be7fc8a72 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <bluss@users.noreply.github.com>
Date: Fri, 2 Aug 2024 09:48:56 +0200
Subject: [PATCH] Organize dependencies with workspace = true (cont.)

Continued cleanup using workspace = true and more uniformity in
dependency listings among all crates.
No functional changes.
---
 Cargo.toml                           | 43 ++++++++++++++++------------
 extra-tests/blas/Cargo.toml          | 13 ++++-----
 extra-tests/numeric/Cargo.toml       | 16 +++++------
 extra-tests/serialization/Cargo.toml | 26 ++++++-----------
 ndarray-rand/Cargo.toml              | 12 ++++----
 5 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5921ebe05..c0c8f8772 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,14 +27,13 @@ bench = false
 test = true
 
 [dependencies]
-num-integer = { version = "0.1.39", default-features = false }
-num-traits = { version = "0.2", default-features = false }
-num-complex = { version = "0.4", default-features = false }
+num-integer = { workspace = true }
+num-traits = { workspace = true }
+num-complex = { workspace = true }
 
+approx = { workspace = true, optional = true }
 rayon = { version = "1.10.0", optional = true }
 
-approx = { version = "0.5", optional = true , default-features = false }
-
 # Use via the `blas` crate feature
 cblas-sys = { version = "0.1.4", optional = true, default-features = false }
 libc = { version = "0.2.82", optional = true }
@@ -44,11 +43,10 @@ matrixmultiply = { version = "0.3.2", default-features = false, features=["cgemm
 serde = { version = "1.0", optional = true, default-features = false, features = ["alloc"] }
 rawpointer = { version = "0.2" }
 
-
 [dev-dependencies]
 defmac = "0.2"
-quickcheck = { version = "1.0", default-features = false }
-approx = "0.5"
+quickcheck = { workspace = true }
+approx = { workspace = true, default-features = true }
 itertools = { version = "0.13.0", default-features = false, features = ["use_std"] }
 
 [features]
@@ -71,21 +69,14 @@ docs = ["approx", "serde", "rayon"]
 std = ["num-traits/std", "matrixmultiply/std"]
 rayon = ["dep:rayon", "std"]
 
-portable-atomic-critical-section = ["portable-atomic/critical-section"]
-
 matrixmultiply-threading = ["matrixmultiply/threading"]
 
+portable-atomic-critical-section = ["portable-atomic/critical-section"]
+
 [target.'cfg(not(target_has_atomic = "ptr"))'.dependencies]
 portable-atomic = { version = "1.6.0" }
 portable-atomic-util = { version = "0.2.0", features = [ "alloc" ] }
 
-[profile.bench]
-debug = true
-[profile.dev.package.numeric-tests]
-opt-level = 2
-[profile.test.package.numeric-tests]
-opt-level = 2
-
 [workspace]
 members = [
     "ndarray-rand",
@@ -95,10 +86,24 @@ members = [
 ]
 
 [workspace.dependencies]
-ndarray = { path = "." }
+ndarray = { version = "0.15", path = "." }
+ndarray-rand = { path = "ndarray-rand" }
+
+num-integer = { version = "0.1.39", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 num-complex = { version = "0.4", default-features = false }
-ndarray-rand = { path = "./ndarray-rand" }
+approx = { version = "0.5", default-features = false }
+quickcheck = { version = "1.0", default-features = false }
+rand = { version = "0.8.0", features = ["small_rng"] }
+rand_distr = { version = "0.4.0" }
+
+[profile.bench]
+debug = true
+
+[profile.test.package.numeric-tests]
+opt-level = 2
+[profile.test.package.blas-tests]
+opt-level = 2
 
 [package.metadata.release]
 no-dev-version = true
diff --git a/extra-tests/blas/Cargo.toml b/extra-tests/blas/Cargo.toml
index a41efa57f..33323ceac 100644
--- a/extra-tests/blas/Cargo.toml
+++ b/extra-tests/blas/Cargo.toml
@@ -8,21 +8,20 @@ edition = "2018"
 [lib]
 test = false
 
-[dev-dependencies]
-approx = "0.5"
-defmac = "0.2"
-num-traits = { workspace = true }
-num-complex = { workspace = true }
-
 [dependencies]
 ndarray = { workspace = true, features = ["approx"] }
 
 blas-src = { version = "0.10", optional = true }
-
 openblas-src = { version = "0.10", optional = true }
 netlib-src = { version = "0.8", optional = true }
 blis-src = { version = "0.2", features = ["system"], optional = true }
 
+[dev-dependencies]
+defmac = "0.2"
+approx = { workspace = true }
+num-traits = { workspace = true }
+num-complex = { workspace = true }
+
 [features]
 # Just for making an example and to help testing, , multiple different possible
 # configurations are selectable here.
diff --git a/extra-tests/numeric/Cargo.toml b/extra-tests/numeric/Cargo.toml
index 3af9538ed..09fe14dbb 100644
--- a/extra-tests/numeric/Cargo.toml
+++ b/extra-tests/numeric/Cargo.toml
@@ -5,25 +5,23 @@ authors = ["bluss"]
 publish = false
 edition = "2018"
 
+[lib]
+test = false
+
 [dependencies]
-approx = "0.5"
 ndarray = { workspace = true, features = ["approx"] }
 ndarray-rand = { workspace = true }
-rand_distr = "0.4"
+
+approx = { workspace = true }
+rand = { workspace = true }
+rand_distr = { workspace = true }
 
 blas-src = { optional = true, version = "0.10", default-features = false, features = ["openblas"] }
 openblas-src = { optional = true, version = "0.10", default-features = false, features = ["cblas", "system"] }
 
-[dependencies.rand]
-version = "0.8.0"
-features = ["small_rng"]
-
 [dev-dependencies]
 num-traits = { workspace = true }
 num-complex = { workspace = true }
 
-[lib]
-test = false
-
 [features]
 test_blas = ["ndarray/blas", "blas-src", "openblas-src"]
diff --git a/extra-tests/serialization/Cargo.toml b/extra-tests/serialization/Cargo.toml
index bdfcaf907..76bf66bf0 100644
--- a/extra-tests/serialization/Cargo.toml
+++ b/extra-tests/serialization/Cargo.toml
@@ -11,24 +11,16 @@ test = false
 [dependencies]
 ndarray = { workspace = true, features = ["serde"] }
 
-[features]
-default = ["ron"]
-
-[dev-dependencies.serde]
-version = "1.0.100"
-default-features = false
-
-[dev-dependencies.serde_json]
-version = "1.0.40"
+serde = { version = "1.0.100", default-features = false }
+ron = { version = "0.8.1", optional = true }
 
-[dev-dependencies.rmp]
+[dev-dependencies]
+serde_json = { version = "1.0.40" }
 # Old version to work with Rust 1.64+
-version = "=0.8.10"
-
-[dev-dependencies.rmp-serde]
+rmp = { version = "=0.8.10" }
 # Old version to work with Rust 1.64+
-version = "0.14"
+rmp-serde = { version = "0.14" }
+
+[features]
+default = ["ron"]
 
-[dependencies.ron]
-version = "0.8.1"
-optional = true
diff --git a/ndarray-rand/Cargo.toml b/ndarray-rand/Cargo.toml
index 4e9bf265f..2824dbd07 100644
--- a/ndarray-rand/Cargo.toml
+++ b/ndarray-rand/Cargo.toml
@@ -14,17 +14,15 @@ description = "Constructors for randomized arrays. `rand` integration for `ndarr
 keywords = ["multidimensional", "matrix", "rand", "ndarray"]
 
 [dependencies]
-ndarray = { version = "0.15", path = ".." }
-rand_distr = "0.4.0"
-quickcheck = { version = "1.0", default-features = false, optional = true }
+ndarray = { workspace = true }
 
-[dependencies.rand]
-version = "0.8.0"
-features = ["small_rng"]
+rand = { workspace = true }
+rand_distr = { workspace = true }
+quickcheck = { workspace = true, optional = true }
 
 [dev-dependencies]
 rand_isaac = "0.3.0"
-quickcheck = { version = "1.0", default-features = false }
+quickcheck = { workspace = true }
 
 [package.metadata.release]
 no-dev-version = true