Merge branch 'latest' of https://github.com/sourmash-bio/sourmash int…

…o fix/dib_lab

.github/workflows/build_wheel.yml

@@ -45,7 +45,7 @@ jobs:
           python-version: '3.9'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.12.1
+        uses: pypa/cibuildwheel@v2.12.3
         env:
           CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}

.github/workflows/build_wheel_all_archs.yml

@@ -66,7 +66,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.12.1
+        uses: pypa/cibuildwheel@v2.12.3
         env:
           CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}

doc/release.md

@@ -27,6 +27,7 @@ After release to PyPI and conda-forge/bioconda packages built:
 - [ ] [PyPI page](https://pypi.org/project/sourmash/) updated
 - [ ] Zenodo DOI successfully minted upon new github release - [see search results](https://zenodo.org/search?page=1&size=20&q=sourmash&sort=mostrecent)
 - [ ] `pip install sourmash` installs the correct version
+- [ ] [conda-forge sourmash-minimal-feedstock](https://github.com/conda-forge/sourmash-minimal-feedstock) has updated `sourmash-minimal` to the correct version 
 - [ ] `mamba create -n smash-release -y sourmash` installs the correct version
 ```
 
@@ -105,7 +106,7 @@ sed -i -e "s|version = .*$|version = \"${new_version}\";|g" flake.nix
 Commit the changes and push the branch:
 ```
 git add pyproject.toml flake.nix
-git commit -m "${new_version} release"
+git commit -m "${new_version} release branch"
 git push -u origin release/v${new_version}
 ```
 and then open a PR for the new branch by following the link printed by
@@ -137,7 +138,7 @@ python -m venv testenv4
 
 cd testenv1
 source bin/activate
-git clone --depth 1 --branch v${new_version}${rc} https://github.com/sourmash-bio/sourmash.git
+git clone --depth 1 --branch release/v${new_version} https://github.com/sourmash-bio/sourmash.git
 cd sourmash
 python -m pip install -r requirements.txt
 pytest && cargo test
@@ -148,7 +149,7 @@ cd ../../testenv2
 deactivate
 source bin/activate
 python -m pip install build
-python -m pip install -e git+https://github.com/sourmash-bio/sourmash.git@v${new_version}${rc}#egg=sourmash[test]
+python -m pip install -e git+https://github.com/sourmash-bio/sourmash.git@release/v${new_version}#egg=sourmash[test]
 cd src/sourmash
 pytest && cargo test
 make dist
@@ -177,7 +178,7 @@ Wait for the
 [various cibuildwheel actions](https://github.com/sourmash-bio/sourmash/actions)
 to finish and upload; the
 [latest release](https://github.com/sourmash-bio/sourmash/releases)
-should have eight wheel files attached to it.
+should have nine wheel files attached to it.
 
 6\. Remove release candidate tags
 
@@ -206,7 +207,7 @@ git pull --rebase
 2\. Create the final tag and push to GitHub:
 
 ```
-git tag -a v${new_version} -m "${new_version} release"
+git tag -a v${new_version} -m "${new_version} release tag"
 git push --tags origin
 ```
 
@@ -302,3 +303,7 @@ Examples:
 - [2.1.0](https://twitter.com/luizirber/status/1166910335120314369)
 - [2.0.1](https://twitter.com/luizirber/status/1136786447518711808)
 - [2.0.0](https://twitter.com/luizirber/status/1108846466502520832)
+
+## After release
+
+Update version to next minor version + `-dev`, e.g. [this PR](https://github.com/sourmash-bio/sourmash/pull/2584).

pyproject.toml

@@ -146,6 +146,7 @@ exclude = [
 ]
 features = ["maturin"]
 locked = true
+module-name = "sourmash._lowlevel"
 
 [tool.isort]
 known_third_party = ["deprecation", "hypothesis", "mmh3", "numpy", "pytest", "screed", "sourmash_tst_utils"]

src/core/Cargo.toml

@@ -95,6 +95,3 @@ wasm-bindgen-test = "0.3.34"
 
 ### These crates don't compile on wasm
 [target.'cfg(not(all(target_arch = "wasm32", target_os="unknown")))'.dependencies]
-
-[package.metadata.maturin]
-name = "sourmash._lowlevel"

src/core/src/sketch/nodegraph.rs

@@ -197,9 +197,7 @@ impl Nodegraph {
             //wtr.write_u32_from::<LittleEndian>(&count.as_slice()[..div])?;
             let slice = &count.as_slice()[..div];
             let buf = unsafe {
-                use std::mem::size_of;
-
-                let len = size_of::<u32>() * slice.len();
+                let len = std::mem::size_of_val(slice);
                 slice::from_raw_parts(slice.as_ptr() as *const u8, len)
             };
             wtr.write_all(buf)?;