Skip to content

Commit 0edfc5d

Browse files
committed
update ci
1 parent 8033237 commit 0edfc5d

File tree

12 files changed

+639
-715
lines changed

12 files changed

+639
-715
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,17 @@ jobs:
2626
runs-on: ${{ matrix.os }}
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
30-
- name: Set up Rust
31-
uses: actions-rs/toolchain@v1
29+
uses: actions/checkout@v4
30+
- name: Set up Rust (Pinned Version)
31+
uses: dtolnay/rust-toolchain@1.81.0
3232
with:
33-
toolchain: 1.81
34-
override: true
35-
- name: Install Clippy (pinned version for this pinned version of Rust)
36-
run: rustup component add clippy
33+
components: clippy, rustfmt, rust-src
3734
- name: Run Clippy (strict for this pinned version of Rust)
3835
run: cargo clippy --all-targets --all-features -- -D warnings
39-
- name: Set up Rust (Latest Stable for Tests)
40-
uses: actions-rs/toolchain@v1
36+
- name: Set up Rust (Latest Stable)
37+
uses: dtolnay/rust-toolchain@stable
4138
with:
42-
toolchain: stable
43-
override: true
44-
- name: Install Clippy (Latest)
45-
run: rustup component add clippy
39+
components: clippy, rustfmt, rust-src
4640
- name: Run Clippy (lenient for latest version)
4741
run: cargo clippy --all-targets --all-features -- -A warnings || echo "Clippy warnings from the latest version"
4842
- name: Test Rust no-default-features
@@ -183,27 +177,27 @@ jobs:
183177
uses: astral-sh/setup-uv@v3
184178
- name: Install Python ${{ matrix.python-version }}
185179
run: uv python install ${{ matrix.python-version }}
186-
- name: Setup, Lint, and Test Python (Linux/macOS)
187-
if: runner.os != 'Windows'
180+
- name: Pinned Ruff
181+
run: uvx ruff@0.6.9 check bed_reader
182+
- name: Lastest Ruff (just to check for warnings)
183+
run: uvx ruff@latest check bed_reader || echo "Ignoring warnings from the latest version of ruff"
184+
- name: Install minimal dependencies
185+
run: uv sync --extra min_dev
186+
- name: Run min tests
188187
run: |
189-
cd bed_reader
190-
uvx ruff@0.6.9 check .
191-
uvx ruff@latest check . || echo "Ignoring warnings from the latest version of ruff"
192-
uv sync --extra min_dev
193-
source ../.venv/bin/activate
194-
pytest tests/test_opt_dep.py
195-
uv sync --extra dev --extra sparse --extra samples
196-
source ../.venv/bin/activate
197-
pytest .
198-
- name: Setup, Lint, and Test Python (Windows)
199-
if: runner.os == 'Windows'
188+
if [[ "$RUNNER_OS" != "Windows" ]]; then
189+
source .venv/bin/activate
190+
else
191+
source .venv/Scripts/activate
192+
fi
193+
pytest bed_reader/tests/test_opt_dep.py
194+
- name: Install all dependencies
195+
run: uv sync --all-extras
196+
- name: Run all tests
200197
run: |
201-
cd bed_reader
202-
uvx ruff@0.6.9 check .
203-
uvx ruff@latest check . || echo "Ignoring warnings from the latest version of ruff"
204-
uv sync --extra min_dev
205-
../.venv/Scripts/activate
206-
pytest tests/test_opt_dep.py
207-
uv sync --extra dev --extra sparse --extra samples
208-
../.venv/Scripts/activate
209-
pytest .
198+
if [[ "$RUNNER_OS" != "Windows" ]]; then
199+
source .venv/bin/activate
200+
else
201+
source .venv/Scripts/activate
202+
fi
203+
pytest bed_runner

Cargo.lock

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
version = "1.0.6-alpha.1"
2+
version = "1.0.6-alpha.2"
33
name = "bed-reader"
44
description = "Read and write the PLINK BED format, simply and efficiently."
55
repository = "https://github.com/fastlmm/bed-reader"
@@ -33,29 +33,29 @@ tokio = ["dep:tokio"]
3333
extension-module = ["pyo3/extension-module", "tokio"]
3434

3535
[dependencies]
36-
thiserror = "1.0.64"
36+
thiserror = "1.0.66"
3737
num-traits = "0.2.19"
3838
ndarray-npy = { version = "0.9.1", default-features = false }
3939
rayon = "1.10.0"
40-
numpy = "0.22.0"
40+
numpy = "0.22.1"
4141
ndarray = { version = "0.16.1", features = ["approx", "rayon"] }
4242
statrs = "0.17.1"
4343
byteorder = { version = "1.5.0", default-features = false }
4444
dpc-pariter = "0.4.0" # // pariter = "0.5.1"
4545
derive_builder = "0.20.2"
46-
anyinput = { version = "0.1.6", features = ["ndarray"] }
46+
anyinput = { version = "0.1.7", features = ["ndarray"] }
4747
fetch-data = "0.2.0"
4848
futures-util = { version = "0.3.31" }
4949
bytecount = { version = "0.6.8" }
5050
itertools = { version = "0.13.0" }
51-
bytes = { version = "1.7.2" }
51+
bytes = { version = "1.8.0" }
5252
cloud-file = { version = "0.2.0" }
5353
pyo3 = { version = "0.22.5", features = ["extension-module"], optional = true }
54-
tokio = { version = "1.40.0", features = ["full"], optional = true }
54+
tokio = { version = "1.41.0", features = ["full"], optional = true }
5555

5656
[dev-dependencies]
5757
ndarray-rand = "0.15.0"
58-
anyhow = "1.0.89"
58+
anyhow = "1.0.92"
5959
rusoto_credential = "0.48.0"
6060
temp_testdir = "0.2.3"
6161
thousands = "0.2.0"

0 commit comments

Comments
 (0)