Skip to content

Commit

Permalink
Merge branch 'latest' of github.com:sourmash-bio/sourmash into fix_si…
Browse files Browse the repository at this point in the history
…g_from_record
  • Loading branch information
ctb committed Nov 12, 2024
2 parents 94acff3 + de1a597 commit 7df6d04
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 96 deletions.
25 changes: 24 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ jobs:
working-directory: pkg
run: npm pack

- name: Publish to NPM
if: startsWith(github.ref, 'refs/tags/r')
working-directory: pkg
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- uses: actions/upload-artifact@v4
with:
path: 'pkg/sourmash*.tgz'
Expand Down Expand Up @@ -216,7 +223,7 @@ jobs:
args: test

publish:
name: Publish (dry-run)
name: Publish (on tags, dry-run otherwise)
runs-on: ubuntu-latest
steps:
- name: Checkout sources
Expand All @@ -243,6 +250,22 @@ jobs:
command: publish
args: --dry-run --manifest-path src/core/Cargo.toml

# Login to crates.io on tags
- name: login to crates.io
uses: actions-rs/cargo@v1
if: startsWith(github.ref, 'refs/tags/r')
with:
command: login
args: ${{ secrets.CRATES_IO_TOKEN }}

# Publish to crates.io on tags
- name: Publish to crates.io
if: startsWith(github.ref, 'refs/tags/r')
uses: actions-rs/cargo@v1
with:
command: publish
args: --manifest-path src/core/Cargo.toml

minimum_rust_version:
runs-on: ubuntu-latest
steps:
Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/rust_publish.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
- id: check-toml
- id: debug-statements
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.2
rev: v0.7.3
hooks:
- id: ruff-format
- id: ruff
Expand Down
60 changes: 40 additions & 20 deletions Cargo.lock

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

6 changes: 6 additions & 0 deletions src/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [0.17.1] - 2024-11-11

Changes/additions:
* fix: Avoid re-calculating md5sum on clone and conversion to KmerMinHashBTree (#3385)
* build: simplify Rust release (#3392)

## [0.17.0] - 2024-11-05

Changes/additions:
Expand Down
8 changes: 4 additions & 4 deletions src/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sourmash"
version = "0.17.0"
version = "0.17.1"
authors = ["Luiz Irber <[email protected]>", "N. Tessa Pierce-Ward <[email protected]>"]
description = "tools for comparing biological sequences with k-mer sketches"
repository = "https://github.com/sourmash-bio/sourmash"
Expand Down Expand Up @@ -32,7 +32,7 @@ byteorder = "1.4.3"
camino = { version = "1.1.9", features = ["serde1"] }
cfg-if = "1.0"
counter = "0.6.0"
csv = "1.3.0"
csv = "1.3.1"
enum_dispatch = "0.3.13"
finch = { version = "0.6.0", optional = true }
fixedbitset = "0.4.0"
Expand All @@ -59,7 +59,7 @@ serde = { version = "1.0.214", features = ["derive"] }
serde_json = "1.0.132"
statrs = "0.17.1"
streaming-stats = "0.2.3"
thiserror = "1.0"
thiserror = "2.0"
twox-hash = "1.6.0"
typed-builder = "0.18.0"
vec-collections = "0.4.3"
Expand All @@ -68,7 +68,7 @@ vec-collections = "0.4.3"
codspeed-criterion-compat = "2.7.2"
proptest = { version = "1.5.0", default-features = false, features = ["std"]}
rand = "0.8.2"
tempfile = "3.13.0"
tempfile = "3.14.0"

[[bench]]
name = "compute"
Expand Down

0 comments on commit 7df6d04

Please sign in to comment.