Organize the workspace of test crates a bit better

Using workspace = true (Rust 1.64+)
rust-ndarray · Aug 1, 2024 · 7bdc2bd · 7bdc2bd
1 parent 14c8123
commit 7bdc2bd
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -51,6 +51,8 @@ jobs:
           - beta
           - nightly
           - 1.64.0  # MSRV
+          - 1.66.0  # MSRV
+          - 1.68.0  # MSRV
 
     name: tests/${{ matrix.rust }}
     steps:

diff --git a/Cargo.toml b/Cargo.toml
@@ -80,7 +80,18 @@ opt-level = 2
 opt-level = 2
 
 [workspace]
-members = ["ndarray-rand", "xtest-serialization", "xtest-blas", "xtest-numeric"]
+members = [
+    "ndarray-rand",
+    "extra-tests/serialization",
+    "extra-tests/blas",
+    "extra-tests/numeric",
+]
+
+[workspace.dependencies]
+ndarray = { path = "." }
+num-traits = { version = "0.2", default-features = false }
+num-complex = { version = "0.4", default-features = false }
+ndarray-rand = { path = "./ndarray-rand" }
 
 [package.metadata.release]
 no-dev-version = true

diff --git a/extra-tests/README.md b/extra-tests/README.md
@@ -0,0 +1,5 @@
+
+# Extra Tests
+
+These are test crates whose settings, features and dependencies should be
+separate from the main crate.
diff --git a/xtest-blas/Cargo.toml → extra-tests/blas/Cargo.toml b/xtest-blas/Cargo.toml → extra-tests/blas/Cargo.toml
@@ -11,11 +11,11 @@ test = false
 [dev-dependencies]
 approx = "0.5"
 defmac = "0.2"
-num-traits = "0.2"
-num-complex = { version = "0.4", default-features = false }
+num-traits = { workspace = true }
+num-complex = { workspace = true }
 
 [dependencies]
-ndarray = { path = "..", features = ["approx", "blas"] }
+ndarray = { workspace = true, features = ["approx"] }
 
 blas-src = { version = "0.10", optional = true }
 

diff --git a/xtest-blas/src/lib.rs → extra-tests/blas/src/lib.rs b/xtest-blas/src/lib.rs → extra-tests/blas/src/lib.rs
diff --git a/xtest-blas/tests/oper.rs → extra-tests/blas/tests/oper.rs b/xtest-blas/tests/oper.rs → extra-tests/blas/tests/oper.rs
diff --git a/xtest-numeric/Cargo.toml → extra-tests/numeric/Cargo.toml b/xtest-numeric/Cargo.toml → extra-tests/numeric/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 
 [dependencies]
 approx = "0.5"
-ndarray = { path = "..", features = ["approx"] }
-ndarray-rand = { path = "../ndarray-rand" }
+ndarray = { workspace = true, features = ["approx"] }
+ndarray-rand = { workspace = true }
 rand_distr = "0.4"
 
 blas-src = { optional = true, version = "0.10", default-features = false, features = ["openblas"] }
@@ -19,8 +19,8 @@ version = "0.8.0"
 features = ["small_rng"]
 
 [dev-dependencies]
-num-traits = { version = "0.2.14", default-features = false }
-num-complex = { version = "0.4", default-features = false }
+num-traits = { workspace = true }
+num-complex = { workspace = true }
 
 [lib]
 test = false

diff --git a/xtest-numeric/src/lib.rs → extra-tests/numeric/src/lib.rs b/xtest-numeric/src/lib.rs → extra-tests/numeric/src/lib.rs
diff --git a/xtest-numeric/tests/accuracy.rs → extra-tests/numeric/tests/accuracy.rs b/xtest-numeric/tests/accuracy.rs → extra-tests/numeric/tests/accuracy.rs
diff --git a/xtest-serialization/Cargo.toml → extra-tests/serialization/Cargo.toml b/xtest-serialization/Cargo.toml → extra-tests/serialization/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 test = false
 
 [dependencies]
-ndarray = { path = "..", features = ["serde"] }
+ndarray = { workspace = true, features = ["serde"] }
 
 [features]
 default = ["ron"]
@@ -21,9 +21,14 @@ default-features = false
 [dev-dependencies.serde_json]
 version = "1.0.40"
 
+[dev-dependencies.rmp]
+# Old version to work with Rust 1.64+
+version = "=0.8.10"
+
 [dev-dependencies.rmp-serde]
-version = "0.14.0"
+# Old version to work with Rust 1.64+
+version = "0.14"
 
 [dependencies.ron]
-version = "0.5.1"
+version = "0.8.1"
 optional = true
diff --git a/xtest-serialization/src/lib.rs → extra-tests/serialization/src/lib.rs b/xtest-serialization/src/lib.rs → extra-tests/serialization/src/lib.rs
diff --git a/xtest-serialization/tests/serialize.rs → extra-tests/serialization/tests/serialize.rs b/xtest-serialization/tests/serialize.rs → extra-tests/serialization/tests/serialize.rs
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
@@ -12,11 +12,13 @@ cargo test --verbose --no-default-features
 cargo test --release --verbose --no-default-features
 cargo build --verbose --features "$FEATURES"
 cargo test --verbose --features "$FEATURES"
-cargo test --manifest-path=ndarray-rand/Cargo.toml --no-default-features --verbose
-cargo test --manifest-path=ndarray-rand/Cargo.toml --features quickcheck --verbose
-cargo test --manifest-path=xtest-serialization/Cargo.toml --verbose
-cargo test --manifest-path=xtest-blas/Cargo.toml --verbose --features openblas-system
+cargo test -p ndarray-rand --no-default-features --verbose
+cargo test -p ndarray-rand --features ndarray-rand/quickcheck --verbose
+
+cargo test -p serialization-tests -v
+cargo test -p blas-tests -v --features blas-tests/openblas-system
+cargo test -p numeric-tests -v
+cargo test -p numeric-tests -v --features numeric-tests/test_blas
+
 cargo test --examples
-cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
-cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose --features test_blas
 ([ "$CHANNEL" != "nightly" ] || cargo bench --no-run --verbose --features "$FEATURES")