Skip to content

Commit

Permalink
Merge pull request #87 from jguhlin/merge-PRs
Browse files Browse the repository at this point in the history
Merge
  • Loading branch information
jguhlin authored Nov 22, 2024
2 parents 0960646 + 1ba25c6 commit 7437cb2
Show file tree
Hide file tree
Showing 5 changed files with 271 additions and 210 deletions.
14 changes: 5 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minimap2"
version = "0.1.20+minimap2.2.28"
version = "0.1.21+minimap2.2.28"
edition = "2021"
authors = ["Joseph Guhlin <joseph.guhlin@gmail.com>"]
license = "MIT OR Apache-2.0"
Expand All @@ -24,21 +24,17 @@ exclude = [

members = []

exclude = [
"minimappers2",
"fakeminimap2",
"minimap2-sys"
]
exclude = ["minimappers2", "fakeminimap2", "minimap2-sys"]

[dependencies]
libc = "0.2"
simdutf8 = {version = "0.1", optional = true}
needletail = { version = "0.5", optional = true, default-features = false}
simdutf8 = { version = "0.1", optional = true }
needletail = { version = "0.6", optional = true, default-features = false}

# Dep for development
minimap2-sys = { path = "./minimap2-sys" }
# minimap2-sys = "0.1.19"
rust-htslib = { version = "0.47", default-features = false, optional = true }
rust-htslib = { version = "0.48", default-features = false, optional = true }

[dev-dependencies]
rayon = "1.10"
Expand Down
139 changes: 31 additions & 108 deletions minimap2-sys/Cargo.lock

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

8 changes: 4 additions & 4 deletions minimap2-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ exclude = [
crate-type = ["cdylib", "rlib"]

[dependencies]
libz-sys = { version = "1.1.17", default-features = false, features = ["libc"] }
libz-sys = { version = "1.1", default-features = false, features = ["libc"] }

[build-dependencies]
pkg-config = "0.3.30"
pkg-config = "0.3"

[build-dependencies.bindgen]
optional = true
version = "0.69.4"
version = "0.70"
default-features = false
features = ["which-rustfmt", "runtime"]

[build-dependencies.cc]
version = "1.1"
version = "1.2"

[features]
default = [] # "libz-sys/libc"
Expand Down
Loading

0 comments on commit 7437cb2

Please sign in to comment.