Skip to content

Commit

Permalink
Deps: update typed-builder and histogram, bump MSRV to 1.65 (#2858)
Browse files Browse the repository at this point in the history
Small MSRV bump to move to newer versions of `typed-builder` and
`histogram`.

Update nix flake deps.

Also disable CI jobs from #2857 until wheel building is fixed.
  • Loading branch information
luizirber committed Dec 5, 2023
1 parent ddabcad commit 9529c73
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_wheel_all_archs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
matrix:
build: [
linux-aarch64,
linux-ppc64le,
linux-s390x,
#linux-ppc64le,
#linux-s390x,
]
include:
- build: linux-aarch64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: "1.64.0"
toolchain: "1.65.0"
override: true

- name: check if README matches MSRV defined here
run: grep '1.64.0' src/core/README.md
run: grep '1.65.0' src/core/README.md

- name: Check if it builds properly
uses: actions-rs/cargo@v1
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
os: ubuntu-22.04
tools:
python: "3.10"
rust: "1.64"
rust: "1.70"
apt_packages:
- llvm-dev
- libclang-dev
Expand Down
22 changes: 17 additions & 5 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions flake.lock

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

7 changes: 7 additions & 0 deletions src/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

Fixed:

- Deps: update typed-builder and histogram, bump MSRV to 1.65 (#2858)
- CI: Fix wheel building and semver checks post r0.12.0 (#2857)

## [0.12.0] - 2023-11-26

MSRV: 1.64
Expand Down
6 changes: 3 additions & 3 deletions src/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
readme = "README.md"
autoexamples = false
autobins = false
rust-version = "1.64.0"
rust-version = "1.65.0"

[lib]
name = "sourmash"
Expand All @@ -37,7 +37,7 @@ finch = { version = "0.6.0", optional = true }
fixedbitset = "0.4.0"
getrandom = { version = "0.2", features = ["js"] }
getset = "0.1.1"
histogram = "0.6.9"
histogram = "0.8.3"
log = "0.4.20"
md5 = "0.7.0"
memmap2 = "0.9.0"
Expand All @@ -56,7 +56,7 @@ serde = { version = "1.0.168", features = ["derive"] }
serde_json = "1.0.108"
thiserror = "1.0"
twox-hash = "1.6.0"
typed-builder = "0.14.0"
typed-builder = "0.18.0"
vec-collections = "0.4.3"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Development happens on github at

## Minimum supported Rust version

Currently the minimum supported Rust version is 1.64.0.
Currently the minimum supported Rust version is 1.65.0.
3 changes: 2 additions & 1 deletion src/core/src/index/revindex/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,8 @@ fn stats_for_cf(db: Arc<DB>, cf_name: &str, deep_check: bool, quick: bool) -> Db
let iter = db.iterator_cf(&cf, rocksdb::IteratorMode::Start);
let mut kcount = 0;
let mut vcount = 0;
let mut vcounts = Histogram::new();
// Using power values from https://docs.rs/histogram/0.8.3/histogram/struct.Config.html#resulting-size
let mut vcounts = Histogram::new(12, 64).expect("Error initializing histogram");
let mut datasets: Datasets = Default::default();

for result in iter {
Expand Down

0 comments on commit 9529c73

Please sign in to comment.