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

CI and dependency clean up #865

Merged
merged 1 commit into from
Sep 8, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
RUSTFLAGS: --deny warnings

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Cache
id: rust-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
Expand All @@ -32,13 +32,13 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml', '.github/workflows/*.yml') }}

- name: Check for forbidden words
run: "! grep --include='*.rs' -RE 'to_be_bytes|from_be_bytes|dbg!' ."
if: runner.os != 'Windows'
run: "! grep --include='*.rs' -RE 'to_be_bytes|from_be_bytes|dbg!' ."

- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"

- uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -73,8 +73,8 @@ jobs:
run: cargo build --all-targets --all-features

- name: Fuzzer
run: just fuzz_ci
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
run: just fuzz_ci

- name: Run tests
run: just build test
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ exclude = ["fuzz/"]
crate-type = ["cdylib", "rlib"]

[build-dependencies]
pyo3-build-config = { version = "0.20.0", optional = true }
pyo3-build-config = { version = "0.22.0", optional = true }

[dependencies]
log = { version = "0.4.17", optional = true }
pyo3 = { version = "0.20.0", features=["extension-module", "abi3-py37"], optional = true }
pyo3 = { version = "0.22.0", features=["extension-module", "abi3-py37"], optional = true }

[target.'cfg(unix)'.dependencies]
libc = "0.2.104"
Expand All @@ -36,18 +36,18 @@ serde = { version = "1.0", features = ["derive"] }
bincode = "1.3.3"
walkdir = "2.5.0"
byte-unit = "=5.0.4"
fastrand = "2.0.0"
sled = "0.34.7"
libc = "0.2.99"

# Just benchmarking dependencies
# Just benchmarking dependencies, which don't build on wasi
[target.'cfg(not(target_os = "wasi"))'.dev-dependencies]
# Pinned to compatibility with MSRV
ctrlc = "=3.2.3"
fastrand = "2.0.0"
heed = "0.20"
sanakirja = "=1.4.1"
sanakirja-core = "=1.4.1"
sled = "0.34.7"
rocksdb = "0.22.0"
libc = "0.2.99"
comfy-table = "7.0.1"

[target.'cfg(target_os = "linux")'.dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/python.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use pyo3::prelude::*;

#[pymodule]
pub fn redb(_py: Python, _m: &PyModule) -> PyResult<()> {
pub fn redb(_m: &Bound<'_, PyModule>) -> PyResult<()> {
Ok(())
}
Loading