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.

Sign up for GitHub

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

Pass through rayon feature to ravif #2348

Merged
merged 9 commits into from
Oct 17, 2024
Merged

Pass through rayon feature to ravif #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9e2409
Pass through rayon feature to ravif
Shnatsel Oct 15, 2024
452ee50
Bump MSRV to 1.70 following ravif
Shnatsel Oct 15, 2024
8828ad4
Do not require such a recent ravif
Shnatsel Oct 15, 2024
4d438c5
Bump MSRV to 1.79 because bitstream-io, a transitive dependency of ra…
Shnatsel Oct 15, 2024
0a88f97
Bump MSRV in github actions as well
Shnatsel Oct 15, 2024
d2b0a15
Revert "Bump MSRV in github actions as well"
Shnatsel Oct 17, 2024
5f91859
Revert "Bump MSRV to 1.79 because bitstream-io, a transitive dependen…
Shnatsel Oct 17, 2024
c83259e
Revert "Do not require such a recent ravif"
Shnatsel Oct 17, 2024
d640382
Require ravif 0.11.11 that has MSRV 1.70
Shnatsel Oct 17, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: ["1.67.1", nightly, beta]
rust: ["1.70.0", nightly, beta]
steps:
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@nightly
if: ${{ matrix.rust == '1.67.1' }}
if: ${{ matrix.rust == '1.70.0' }}
- name: Generate Cargo.lock with minimal-version dependencies
if: ${{ matrix.rust == '1.67.1' }}
if: ${{ matrix.rust == '1.70.0' }}
run: cargo -Zminimal-versions generate-lockfile

- uses: dtolnay/rust-toolchain@v1
Expand All @@ -58,7 +58,7 @@ jobs:
- name: build
run: cargo build -v
- name: test
if: ${{ matrix.rust != '1.67.1' }}
if: ${{ matrix.rust != '1.70.0' }}
run: cargo test -v && cargo doc -v

test_other_archs:
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
resolver = "2"

# note: when changed, also update test runner in `.github/workflows/rust.yml`
rust-version = "1.67.1"
rust-version = "1.70.0"

license = "MIT OR Apache-2.0"
description = "Imaging library. Provides basic image processing and encoders/decoders for common image formats."
Expand Down Expand Up @@ -49,7 +49,7 @@ image-webp = { version = "0.2.0", optional = true }
mp4parse = { version = "0.17.0", optional = true }
png = { version = "0.17.6", optional = true }
qoi = { version = "0.4", optional = true }
ravif = { version = "0.11.3", default-features = false, optional = true }
ravif = { version = "0.11.11", default-features = false, optional = true }
rayon = { version = "1.7.0", optional = true }
rgb = { version = "0.8.48", default-features = false, optional = true }
tiff = { version = "0.9.0", optional = true }
Expand Down Expand Up @@ -85,7 +85,7 @@ tiff = ["dep:tiff"]
webp = ["dep:image-webp"]

# Other features
rayon = ["dep:rayon"] # Enables multi-threading
rayon = ["dep:rayon", "ravif?/threading"] # Enables multi-threading
nasm = ["ravif?/asm"] # Enables use of nasm by rav1e (requires nasm to be installed)
color_quant = ["dep:color_quant"] # Enables color quantization
avif-native = ["dep:mp4parse", "dep:dcv-color-primitives", "dep:dav1d"] # Enable native dependency libdav1d
Expand Down
Loading