Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into bump-polars
Browse files Browse the repository at this point in the history
  • Loading branch information
nwagner84 committed May 28, 2024
2 parents 568f670 + 703f317 commit 0766913
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:
matrix:
target:
- { os: ubuntu-latest, toolchain: stable, triple: x86_64-unknown-linux-gnu }
- { os: ubuntu-latest, toolchain: 1.74.1, triple: x86_64-unknown-linux-gnu }
- { os: ubuntu-latest, toolchain: 1.76, triple: x86_64-unknown-linux-gnu }
- { os: ubuntu-latest, toolchain: beta, triple: x86_64-unknown-linux-gnu }
- { os: ubuntu-latest, toolchain: nightly, triple: x86_64-unknown-linux-gnu }
- { os: macos-latest, toolchain: stable, triple: x86_64-apple-darwin }
- { os: macos-latest, toolchain: 1.74.1, triple: x86_64-apple-darwin }
- { os: macos-latest, toolchain: 1.76, triple: x86_64-apple-darwin }
- { os: windows-latest, toolchain: stable, triple: x86_64-pc-windows-gnu }
- { os: windows-latest, toolchain: 1.74.1, triple: x86_64-pc-windows-gnu }
- { os: windows-latest, toolchain: 1.76, triple: x86_64-pc-windows-gnu }
- { os: windows-latest, toolchain: stable, triple: i686-pc-windows-msvc }
- { os: windows-latest, toolchain: 1.74.1, triple: i686-pc-windows-msvc }
- { os: windows-latest, toolchain: 1.76, triple: i686-pc-windows-msvc }
runs-on: ${{ matrix.target.os }}
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ license = "EUPL-1.2"
readme = "./README.md"
keywords = ["PICA+", "code4lib"]
edition = "2021"
rust-version = "1.74.1"
rust-version = "1.76"

[workspace.dependencies]
pica-matcher = { version = "0.24", path = "./crates/pica-matcher" }
Expand All @@ -31,8 +31,8 @@ pica-utils = { version = "0.24", path = "./crates/pica-utils" }
anyhow = "1.0"
bstr = "1.9"
chrono = { version = "0.4", default-features = false }
clap = "4.4"
clap_complete = "4.4"
clap = "4.5"
clap_complete = "4.5"
csv = "1.3"
flate2 = "1.0"
polars = { version = "0.40", features = ["ipc", "decompress", "performant"] }
Expand Down
3 changes: 0 additions & 3 deletions crates/pica-toolkit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ toml = { workspace = true }
unicode-normalization = { version = "0.1" }

[dev-dependencies]
assert_cmd = "2.0"
predicates = "3.0"
quickcheck = "1.0"
quickcheck_macros = "1.0"
tempfile = "3.8"
trycmd = "0.15"

[[bin]]
Expand Down

0 comments on commit 0766913

Please sign in to comment.