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

Jump to bottom

Use workspace versioning and relax hashbrown/indexmap deps #956

Merged
merged 3 commits into from
Aug 7, 2023
Merged

Use workspace versioning and relax hashbrown/indexmap deps #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85f5334
Use workspace versioning and relax `hashbrown`/`indexmap` deps
jakelishman Aug 1, 2023
bb54a0b
Merge branch 'main' into workspace-relax-indexmap-hashbrown
IvanIsCoding Aug 1, 2023
92c45cd
Merge branch 'main' into workspace-relax-indexmap-hashbrown
IvanIsCoding Aug 7, 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
100 changes: 60 additions & 40 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 36 additions & 21 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,60 @@
[package]
name = "rustworkx"
description = "A python graph library implemented in Rust"
version = "0.14.0"
authors = ["Matthew Treinish <mtreinish@kortar.org>"]
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/Qiskit/rustworkx"
keywords = ["python", "graph"]
edition = "2021"
rust-version = "1.64"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true

[workspace]
members = [
"rustworkx-core",
]

[lib]
name = "rustworkx"
crate-type = ["cdylib"]
[workspace.package]
IvanIsCoding marked this conversation as resolved.
Show resolved Hide resolved
version = "0.14.0"
edition = "2021"
rust-version = "1.64"
authors = ["Matthew Treinish <mtreinish@kortar.org>"]
repository = "https://github.com/Qiskit/rustworkx"
license = "Apache-2.0"

[dependencies]
[workspace.dependencies]
ahash = "0.8.3"
petgraph = "0.6.3"
fixedbitset = "0.4.2"
hashbrown = { version = ">=0.13, <0.15", features = ["rayon"] }
indexmap = { version = ">=1.9, <3", features = ["rayon"] }
num-traits = "0.2"
numpy = "0.19.0"
petgraph = "0.6.3"
rand = "0.8"
rand_pcg = "0.3"
rayon = "1.7"
num-traits = "0.2"
rayon-cond = "1.7"

[lib]
name = "rustworkx"
crate-type = ["cdylib"]

[dependencies]
ahash.workspace = true
fixedbitset.workspace = true
hashbrown.workspace = true
indexmap.workspace = true
ndarray-stats = "0.5.1"
num-bigint = "0.4"
num-complex = "0.4"
ndarray-stats = "0.5.1"
num-traits.workspace = true
numpy.workspace = true
petgraph.workspace = true
quick-xml = "0.30"
rand.workspace = true
rand_pcg.workspace = true
rayon.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
rustworkx-core = { path = "rustworkx-core", version = "=0.14.0" }
Expand All @@ -40,18 +63,10 @@ rustworkx-core = { path = "rustworkx-core", version = "=0.14.0" }
version = "0.19.2"
features = ["extension-module", "hashbrown", "num-bigint", "num-complex", "indexmap"]

[dependencies.hashbrown]
version = "0.13"
features = ["rayon"]

[dependencies.ndarray]
version = "^0.15.6"
features = ["rayon"]

[dependencies.indexmap]
version = "1.9"
features = ["rayon"]

[dependencies.sprs]
version = "^0.11"
features = ["multi_thread"]
Expand Down
38 changes: 16 additions & 22 deletions rustworkx-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
[package]
name = "rustworkx-core"
version = "0.14.0"
edition = "2021"
authors = ["Matthew Treinish <mtreinish@kortar.org>"]
description = "Rust APIs used for rustworkx algorithms"
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/Qiskit/rustworkx"
homepage = "https://github.com/Qiskit/rustworkx/tree/main/rustworkx-core"
keywords = ["graph"]
rust-version = "1.64"
homepage = "https://github.com/Qiskit/rustworkx/tree/main/rustworkx-core"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true

[dependencies]
ahash = "0.8.3"
fixedbitset = "0.4.2"
petgraph = "0.6.3"
rand = "0.8.5"
rand_pcg = "0.3.1"
rayon = "1.7"
num-traits = "0.2"
ahash.workspace = true
fixedbitset.workspace = true
hashbrown.workspace = true
indexmap.workspace = true
num-traits.workspace = true
petgraph.workspace = true
priority-queue = "1.3"
rand.workspace = true
rand_pcg.workspace = true
rayon.workspace = true
rayon-cond = "0.3"

[dependencies.hashbrown]
version = "0.13"
features = ["rayon"]

[dependencies.indexmap]
version = "1.9"
features = ["rayon"]