Merge branch 'latest' of github.com:sourmash-bio/sourmash into pre-co…

…mmit-ci-update-config
sourmash-bio · May 7, 2024 · 9a46bb2 · 9a46bb2
2 parents 3f9b609 + 60b95ce
commit 9a46bb2
Show file tree

Hide file tree

Showing 42 changed files with 1,141 additions and 288 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -46,7 +46,7 @@ jobs:
           python-version: '3.10'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.17.0
         env:
           CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}

diff --git a/.github/workflows/build_wheel_all_archs.yml b/.github/workflows/build_wheel_all_archs.yml
@@ -16,7 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [aarch64, ppc64le]
+        target: [aarch64]
+        #target: [aarch64, ppc64le]
         #target: [aarch64, s390x, ppc64le]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/dev_envs.yml b/.github/workflows/dev_envs.yml
@@ -15,9 +15,9 @@ jobs:
         fetch-depth: 0
 
     - name: Install Nix
-      uses: DeterminateSystems/nix-installer-action@v9
+      uses: DeterminateSystems/nix-installer-action@v10
     - name: Run the Magic Nix Cache
-      uses: DeterminateSystems/magic-nix-cache-action@v3
+      uses: DeterminateSystems/magic-nix-cache-action@v4
 
     - run: nix run .# -- --version
 
@@ -40,7 +40,7 @@ jobs:
           ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
 
     - name: setup conda
-      uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081
+      uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca
       with:
         auto-update-conda: true
         python-version: "3.10"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -56,6 +56,9 @@ last-tag:
 wasm:
 	wasm-pack build src/core -d ../../pkg
 
+wasm-test:
+	wasm-pack test --node src/core
+
 wasi:
 	cargo wasi build
 

diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@ Quickly search, compare, and analyze genomic and metagenomic data sets.
 <a href="https://github.com/sourmash-bio/sourmash/blob/latest/LICENSE"><img alt="License: 3-Clause BSD" src="https://img.shields.io/badge/License-BSD%203--Clause-blue.svg"></a>
 [![Documentation](https://readthedocs.org/projects/sourmash/badge/?version=latest)](http://sourmash.readthedocs.io/en/latest/)
 [![Gitter](https://badges.gitter.im/sourmash-bio/community.svg)](https://gitter.im/sourmash-bio/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
 [![DOI](http://joss.theoj.org/papers/10.21105/joss.00027/status.svg)](http://joss.theoj.org/papers/10.21105/joss.00027)
+[![pyOpenSci](https://tinyurl.com/y22nb8up)](https://github.com/pyOpenSci/software-submission/issues/129)
 
 [![Bioconda install](https://img.shields.io/conda/dn/bioconda/sourmash.svg?style=flag&label=Bioconda)](https://anaconda.org/bioconda/sourmash)
 <a href="https://pypi.org/project/sourmash/"><img alt="PyPI" src="https://badge.fury.io/py/sourmash.svg"></a>