Skip to content

Commit

Permalink
Merge 61ebb2a into 1582a7e
Browse files Browse the repository at this point in the history
  • Loading branch information
pmarks committed Jan 30, 2020
2 parents 1582a7e + 61ebb2a commit 28baaed
Show file tree
Hide file tree
Showing 2 changed files with 623 additions and 354 deletions.
13 changes: 8 additions & 5 deletions Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "shardio"
version = "0.5.5"
version = "0.6.0"
authors = ["Patrick Marks <patrick@10xgenomics.com>", "Sreenath Krishnan <sreenath.krishnan@10xgenomics.com>", "Lance Hepler <lance.hepler@10xgenomics.com>"]
edition = "2018"
license = "MIT"
Expand All @@ -20,19 +20,22 @@ bincode = "1.1"
byteorder = "1.3.0"
lz4 = "1"
failure = "0.1.5"
crossbeam-channel = "0.3.8"
failure_derive = "0.1"
min-max-heap = "1.2.2"
serde = { version = "1.0", features = ["derive"] }
crossbeam-channel = "0.4.0"
log = "^0.4"
rustc_version_runtime = "^0.1"
semver = { version = "^0.9", features = ["serde"] }

[dev-dependencies]
tempfile = "3.0"
tempfile = "^3.1"
criterion = "0.3"
fxhash = "0.2.1"
lazy_static = "1.2"
pretty_assertions = "0.5.1"
quickcheck = "0.8.5"
rand = "0.6.5"
quickcheck = "0.9"
rand = "^0.7"
is_sorted = "0.1"

[[bench]]
Expand Down

0 comments on commit 28baaed

Please sign in to comment.