Skip to content

Commit

Permalink
Merge branch 'latest' into lins-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
bluegenes authored Apr 5, 2023
2 parents 907b74c + 43ec4ec commit 5804124
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
python-version: '3.9'

- name: Build wheels
uses: pypa/cibuildwheel@v2.12.0
uses: pypa/cibuildwheel@v2.12.1
env:
CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
CIBW_ARCHS_LINUX: ${{ matrix.arch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheel_all_archs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
platforms: all

- name: Build wheels
uses: pypa/cibuildwheel@v2.12.0
uses: pypa/cibuildwheel@v2.12.1
env:
CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
CIBW_ARCHS_LINUX: ${{ matrix.arch }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,11 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: 1.56.1
toolchain: "1.60.0"
override: true

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

- name: Check if it builds properly
uses: actions-rs/cargo@v1
Expand Down
89 changes: 55 additions & 34 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ demo = [
]
doc = [
"sphinx>=4.4.0,<7",
"myst-parser==0.19.1",
"myst-parser==1.0.0",
"Jinja2==3.1.2",
"alabaster",
"sphinxcontrib-napoleon",
Expand Down
12 changes: 6 additions & 6 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.56.1"
rust-version = "1.60.0"

[lib]
name = "sourmash"
Expand Down Expand Up @@ -40,11 +40,11 @@ nohash-hasher = "0.2.0"
num-iter = "0.1.43"
once_cell = "1.17.1" # once_cell 1.14+ requires Rust 1.56+
rayon = { version = "1.7.0", optional = true }
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.94"
serde = { version = "1.0.158", features = ["derive"] }
serde_json = "1.0.95"
primal-check = "0.3.1"
thiserror = "1.0"
typed-builder = "0.13.0"
typed-builder = "0.14.0"
twox-hash = "1.6.0"
vec-collections = "0.3.4"
piz = "0.4.0" # piz 0.5.1 requires Rust 1.63+
Expand All @@ -54,7 +54,7 @@ ouroboros = "0.15.6"
[dev-dependencies]
assert_matches = "1.3.0"
criterion = "0.3.2"
needletail = { version = "0.5.0", default-features = false }
needletail = { version = "0.5.1", default-features = false }
proptest = { version = "1.1.0", default-features = false, features = ["std"]}
rand = "0.8.2"
getrandom = { version = "0.2", features = ["js"] }
Expand Down Expand Up @@ -87,7 +87,7 @@ version = "0.3.61"
features = ["console", "File"]

[target.'cfg(all(target_arch = "wasm32"))'.dependencies.chrono]
version = "0.4.23"
version = "0.4.24"
features = ["wasmbind"]