Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MRG] Bump MSRV to 1.42 (and other dep fixes) #1461

Merged
merged 3 commits into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,12 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: 1.37.0
toolchain: 1.42.0
override: true

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

- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
Expand Down
17 changes: 8 additions & 9 deletions src/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ parallel = ["rayon"]

[dependencies]
az = "1.0.0"
backtrace = "=0.3.46" # later versions require rust 1.40
backtrace = "0.3.56"
bytecount = "0.6.0"
byteorder = "1.3.4"
byteorder = "1.4.3"
cfg-if = "1.0"
finch = { version = "0.4.1", optional = true }
fixedbitset = "0.3.0"
fixedbitset = "0.4.0"
getset = "0.1.1"
log = "0.4.8"
md5 = "0.7.0"
Expand All @@ -40,9 +40,9 @@ once_cell = "1.3.1"
rayon = { version = "1.3.0", optional = true }
serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.53"
primal-check = "0.2.3"
primal-check = "0.3.1"
thiserror = "1.0"
typed-builder = "0.7.0"
typed-builder = "0.9.0"

[target.'cfg(all(target_arch = "wasm32", target_vendor="unknown"))'.dependencies.wasm-bindgen]
version = "0.2.62"
Expand All @@ -51,7 +51,7 @@ features = ["serde-serialize"]
[target.'cfg(all(target_arch = "wasm32", target_vendor="unknown"))'.dev-dependencies]
wasm-bindgen-test = "0.3.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies.assert_cmd]
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.assert_cmd]
version = "1.0.1"

[package.metadata.wasm-pack.profile.release]
Expand All @@ -60,10 +60,9 @@ wasm-opt = false # https://github.com/rustwasm/wasm-pack/issues/886
[dev-dependencies]
assert_matches = "1.3.0"
criterion = "0.3.2"
# Upgrade to 0.4.1 requires rust 1.42
needletail = { version = "=0.4.0", default-features = false }
needletail = { version = "0.4.1", default-features = false }
predicates = "1.0.4"
proptest = { version = "1.0.0", default-features = false, features = ["std"]} # Upgrade to 0.10 requires rust 1.39
proptest = { version = "1.0.0", default-features = false, features = ["std"]}
rand = "0.8.2"
getrandom = { version = "0.2", features = ["js"] }
tempfile = "3.1.0"
Expand Down
4 changes: 4 additions & 0 deletions src/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ Please ask questions and files issues

Development happens on github at
[dib-lab/sourmash](https://github.com/dib-lab/sourmash).

## Minimum supported Rust version

Currently the minimum supported Rust version is 1.42.0.