Skip to content

Commit 21fbf10

Browse files
authored
Merge branch 'main' into gafBinding
2 parents 83953b3 + 711624f commit 21fbf10

File tree

21 files changed

+229
-520
lines changed

21 files changed

+229
-520
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- uses: actions/checkout@v4
61-
- uses: actions-rust-lang/setup-rust-toolchain@v1
61+
- run: rustup toolchain install stable --no-self-update
6262

6363
# Install slow-odgi.
6464
- uses: actions/cache@v4

.github/workflows/code-quality.yml

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,49 @@
1-
name: CodeQuality
2-
on: [pull_request]
1+
name: quality
2+
on:
3+
push:
4+
pull_request:
5+
branches: [main]
36

47
jobs:
5-
build:
8+
python:
69
runs-on: ubuntu-latest
7-
name: CodeQuality
10+
name: Python
811
steps:
9-
- uses: actions/checkout@v3
10-
- uses: actions/setup-python@v2
12+
- uses: actions/checkout@v4
13+
14+
- name: ruff check
15+
uses: astral-sh/ruff-action@v3
16+
with:
17+
src: >-
18+
mygfa
19+
slow_odgi
20+
pollen_data_gen
21+
flatgfa-py
22+
23+
- name: ruff format
24+
uses: astral-sh/ruff-action@v3
1125
with:
12-
python-version: 3.x
13-
- run: pip install --upgrade pip
14-
- run: pip install "black<24" mypy==v1.3
15-
- run: black --diff --check $(git ls-files '*.py')
16-
- run: MYPYPATH=mygfa mypy --no-namespace-packages --disallow-untyped-defs mygfa slow_odgi pollen_data_gen
26+
args: "format --check --diff"
27+
src: >-
28+
mygfa
29+
slow_odgi
30+
pollen_data_gen
31+
flatgfa-py
32+
33+
- name: Install uv
34+
uses: astral-sh/setup-uv@v5
35+
- name: mypy
36+
run: MYPYPATH=mygfa uv tool run mypy --no-namespace-packages --disallow-untyped-defs mygfa slow_odgi pollen_data_gen
37+
38+
rust:
39+
runs-on: ubuntu-latest
40+
name: Rust
41+
env:
42+
RUSTFLAGS: "-Dwarnings"
43+
steps:
44+
- uses: actions/checkout@v4
45+
- run: rustup toolchain install stable --no-self-update
46+
- uses: Swatinem/rust-cache@v2
47+
- run: cargo check
48+
- run: cargo clippy
49+
- run: cargo fmt --check

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ __pycache__/
1818
og_to_gfa.py
1919
compute_maxes.py
2020

21-
flatgfa/target
22-
flatgfa-py/target
21+
target/
2322
pollen/*.rlib
2423

2524
slow_odgi/dist/

0 commit comments

Comments
 (0)