Skip to content

Commit fe2cd2e

Browse files
committed
replace pre-commit-hooks with treefmt
1 parent 47a80cd commit fe2cd2e

File tree

3 files changed

+102
-10
lines changed

3 files changed

+102
-10
lines changed

.builds/qbpm.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@ environment:
66
tasks:
77
- deps: |
88
cd qbpm
9-
$NIX build .#devShells.x86_64-linux.default
10-
- format: |
9+
$NIX build .#devShells.x86_64-linux.default .#checks.x86_64-linux.formatting
10+
- check: |
1111
cd qbpm
12-
$NIX develop -c ruff format --check qbpm tests
13-
- ruff: |
14-
cd qbpm
15-
$NIX develop -c ruff check qbpm tests
16-
- mypy: |
17-
cd qbpm
18-
$NIX develop -c mypy qbpm tests
12+
$NIX flake check
1913
- pytest: |
2014
cd qbpm
2115
$NIX develop -c pytest

flake.lock

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

flake.nix

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,29 @@
33

44
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
55
inputs.flake-utils.url = "github:numtide/flake-utils";
6+
inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
7+
inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
68

79
outputs = {
810
self,
911
nixpkgs,
1012
flake-utils,
13+
treefmt-nix,
1114
}:
1215
flake-utils.lib.eachDefaultSystem (
1316
system: let
1417
pkgs = nixpkgs.legacyPackages.${system};
18+
treefmt = treefmt-nix.lib.evalModule pkgs {
19+
projectRootFile = "flake.nix";
20+
programs.mypy.enable = true;
21+
programs.mypy.directories."." = {
22+
modules = ["qbpm" "tests"];
23+
extraPythonPackages = with pkgs.python3.pkgs; [pyxdg click];
24+
};
25+
programs.ruff.check = true;
26+
programs.ruff.format = true;
27+
programs.alejandra.enable = true;
28+
};
1529
in rec {
1630
packages = flake-utils.lib.flattenTree rec {
1731
qbpm = import ./. {inherit pkgs;};
@@ -28,14 +42,16 @@
2842
with ps; [
2943
pyxdg
3044
click
45+
3146
pytest
3247
mypy
33-
3448
pylsp-mypy
3549
ruff-lsp
3650
]))
3751
];
3852
};
53+
formatter = treefmt.config.build.wrapper;
54+
checks.formatting = treefmt.config.build.check self;
3955
}
4056
);
4157
}

0 commit comments

Comments
 (0)