Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/test_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ jobs:
run: cargo build --verbose
- name: cargo test
run: cargo test --verbose
- name: cargo build (core only)
run: cargo build --verbose --no-default-features
- name: cargo test (core only)
run: cargo test --verbose --no-default-features
34 changes: 17 additions & 17 deletions Cargo.lock

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

14 changes: 9 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
[package]
name = "hp"
version = "0.1.0"
name = "deeptools-core"
version = "4.0.0"
edition = "2024"
rust-version = "1.87"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
name = "hp"
crate-type = ["cdylib"]
name = "deeptools_core"
crate-type = ["rlib", "cdylib"]

[features]
python = ["dep:pyo3", "pyo3/extension-module"]
default = ["python"]

[dependencies]
openssl-sys = { version = "0.9.117", features = ["vendored"] }
pyo3 = { version = ">= 0.28.2", features = ["extension-module"] }
pyo3 = { version = ">= 0.28.2", optional = true }
bigtools = { version = "0.5.8", default-features = false, features = ["read", "write"] }
rust-htslib = "1.0.1"
rayon = "1.12.0"
Expand Down
Binary file modified galaxy/wrapper/test-data/alignmentSieve2.bam
Binary file not shown.
Binary file modified galaxy/wrapper/test-data/alignmentSieve3.bam
Binary file not shown.
Binary file modified pydeeptools/deeptools/test/test_data/alignmentSieve4.bam
Binary file not shown.
Binary file modified pydeeptools/deeptools/test/test_data/alignmentSieve5.bam
Binary file not shown.
Binary file modified pydeeptools/deeptools/test/test_data/alignmentSieve6.bam
Binary file not shown.
Binary file modified pydeeptools/deeptools/test/test_data/alignmentSieve7.bam
Binary file not shown.
Binary file modified pydeeptools/deeptools/test/test_data/alignmentSieve8.bam
Binary file not shown.
10 changes: 10 additions & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
{
"type": "generic",
"path": "galaxy/wrapper/deepTools_macros.xml"
},
{
"type": "toml",
"path": "Cargo.toml",
"jsonpath": "$.package.version"
},
{
"type": "toml",
"path": "Cargo.lock",
"jsonpath": "$.package[?(@.name.value=='deeptools-core')].version"
}
]
}
Expand Down
21 changes: 21 additions & 0 deletions scripts/check_version_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,20 @@ def galaxy_tool_version() -> str:
return match.group(1)


def cargo_crate_version() -> str:
data = tomllib.loads((REPO_ROOT / "Cargo.toml").read_text())
return data["package"]["version"]


def cargo_lock_crate_version() -> str:
name = tomllib.loads((REPO_ROOT / "Cargo.toml").read_text())["package"]["name"]
lock = tomllib.loads((REPO_ROOT / "Cargo.lock").read_text())
for package in lock["package"]:
if package["name"] == name:
return package["version"]
sys.exit(f"could not find crate {name!r} in Cargo.lock")


def main() -> None:
cargo_version = cargo_rust_version()
mismatches: dict[str, tuple[str, str]] = {}
Expand All @@ -125,6 +139,13 @@ def main() -> None:
galaxy_version,
)

for label, version in (
("deeptools: Cargo.toml [package] version", cargo_crate_version()),
("deeptools: Cargo.lock crate version", cargo_lock_crate_version()),
):
if version != pkg_version:
mismatches[label] = (pkg_version, version)

if mismatches:
print("Version mismatch detected:", file=sys.stderr)
for name, (expected, actual) in mismatches.items():
Expand Down
Loading
Loading