Skip to content

Commit 22ec7b5

Browse files
committed
Separate out workspace, move hdf5 crate to hdf5/
1 parent 2ad51d7 commit 22ec7b5

38 files changed

+59
-60
lines changed

Cargo.toml

Lines changed: 4 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,17 @@
1-
[package]
2-
name = "hdf5"
3-
readme = "README.md"
4-
description = "Thread-safe Rust bindings for the HDF5 library."
5-
build = "build.rs"
6-
categories = ["science", "filesystem"]
7-
version.workspace = true
8-
rust-version.workspace = true
9-
authors.workspace = true
10-
keywords.workspace = true
11-
license.workspace = true
12-
repository.workspace = true
13-
homepage.workspace = true
14-
edition.workspace = true
1+
[workspace]
2+
members = ["hdf5", "hdf5-types", "hdf5-derive", "hdf5-sys", "hdf5-src"]
3+
default-members = ["hdf5", "hdf5-types", "hdf5-derive", "hdf5-sys"]
154

165
[workspace.package]
176
version = "0.8.1" # !V
187
rust-version = "1.64.0"
19-
authors = ["Ivan Smirnov <i.s.smirnov@gmail.com>"]
8+
authors = ["Ivan Smirnov <[email protected]>", "Magnus Ulimoen <[email protected].com>"]
209
keywords = ["hdf5"]
2110
license = "MIT OR Apache-2.0"
2211
repository = "https://github.com/aldanor/hdf5-rust"
2312
homepage = "https://github.com/aldanor/hdf5-rust"
2413
edition = "2021"
2514

26-
[features]
27-
default = []
28-
mpio = ["mpi-sys", "hdf5-sys/mpio"]
29-
lzf = ["lzf-sys", "errno"]
30-
blosc = ["blosc-sys"]
31-
# The features with version numbers such as 1.10.3, 1.12.0 are metafeatures
32-
# and is only available when the HDF5 library is at least this version.
33-
# Features have_direct and have_parallel are also metafeatures and dependent
34-
# on the HDF5 library which is linked against.
35-
36-
[workspace]
37-
members = [".", "hdf5-types", "hdf5-derive", "hdf5-sys", "hdf5-src"]
38-
default-members = [".", "hdf5-types", "hdf5-derive", "hdf5-sys"]
39-
40-
[dependencies]
41-
# external
42-
bitflags = "2.3"
43-
blosc-sys = { version = "0.2", package = "blosc-src", optional = true }
44-
cfg-if = { workspace = true }
45-
errno = { version = "0.3", optional = true }
46-
lazy_static = "1.4"
47-
libc = { workspace = true }
48-
lzf-sys = { version = "0.1", optional = true }
49-
mpi-sys = { workspace = true, optional = true }
50-
ndarray = "0.15"
51-
parking_lot = "0.12"
52-
paste = "1.0"
53-
# internal
54-
hdf5-derive = { workspace = true }
55-
hdf5-sys = { workspace = true }
56-
hdf5-types = { workspace = true }
57-
5815
[workspace.dependencies]
5916
# external
6017
cfg-if = "1.0"
@@ -67,15 +24,3 @@ hdf5-derive = { version = "0.8.1", path = "hdf5-derive" } # !V
6724
hdf5-src = { version = "0.8.1", path = "hdf5-src" } # !V
6825
hdf5-sys = { version = "0.8.1", path = "hdf5-sys" } # !V
6926
hdf5-types = { version = "0.8.1", path = "hdf5-types" } # !V
70-
71-
[dev-dependencies]
72-
paste = "1.0"
73-
pretty_assertions = "1.3"
74-
rand = { version = "0.8", features = ["small_rng"] }
75-
regex = { workspace = true }
76-
scopeguard = "1.1"
77-
tempfile = "3.6"
78-
79-
[package.metadata.docs.rs]
80-
features = ["hdf5-sys/static", "hdf5-sys/zlib", "blosc", "lzf"]
81-
rustdoc-args = ["--cfg", "docsrs"]

hdf5-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ syn = { version = "2.0", features = ["derive", "extra-traits"]}
2323

2424
[dev-dependencies]
2525
trybuild = "1.0"
26-
hdf5 = { version = ">=0.7.1", path = ".." }
26+
hdf5 = { version = ">=0.7.1", path = "../hdf5" }

hdf5/Cargo.toml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[package]
2+
name = "hdf5"
3+
readme = "../README.md"
4+
description = "Thread-safe Rust bindings for the HDF5 library."
5+
build = "build.rs"
6+
categories = ["science", "filesystem"]
7+
version.workspace = true
8+
rust-version.workspace = true
9+
authors.workspace = true
10+
keywords.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
homepage.workspace = true
14+
edition.workspace = true
15+
16+
[features]
17+
default = []
18+
mpio = ["mpi-sys", "hdf5-sys/mpio"]
19+
lzf = ["lzf-sys", "errno"]
20+
blosc = ["blosc-sys"]
21+
# The features with version numbers such as 1.10.3, 1.12.0 are metafeatures
22+
# and is only available when the HDF5 library is at least this version.
23+
# Features have_direct and have_parallel are also metafeatures and dependent
24+
# on the HDF5 library which is linked against.
25+
26+
[dependencies]
27+
# external
28+
bitflags = "2.3"
29+
blosc-sys = { version = "0.2", package = "blosc-src", optional = true }
30+
cfg-if = { workspace = true }
31+
errno = { version = "0.3", optional = true }
32+
lazy_static = "1.4"
33+
libc = { workspace = true }
34+
lzf-sys = { version = "0.1", optional = true }
35+
mpi-sys = { workspace = true, optional = true }
36+
ndarray = "0.15"
37+
parking_lot = "0.12"
38+
paste = "1.0"
39+
# internal
40+
hdf5-derive = { workspace = true }
41+
hdf5-sys = { workspace = true }
42+
hdf5-types = { workspace = true }
43+
44+
[dev-dependencies]
45+
paste = "1.0"
46+
pretty_assertions = "1.3"
47+
rand = { version = "0.8", features = ["small_rng"] }
48+
regex = { workspace = true }
49+
scopeguard = "1.1"
50+
tempfile = "3.6"
51+
52+
[package.metadata.docs.rs]
53+
features = ["hdf5-sys/static", "hdf5-sys/zlib", "blosc", "lzf"]
54+
rustdoc-args = ["--cfg", "docsrs"]

build.rs renamed to hdf5/build.rs

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)