Skip to content

Commit 250fbc7

Browse files
committed
fix merge conflict and ruff usage
Signed-off-by: John Seekins <john@robot-house.us>
1 parent 4d89f05 commit 250fbc7

4 files changed

Lines changed: 10 additions & 37 deletions

File tree

.config/mise.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
[tools]
2-
python = "3.14.1"
2+
# languages
33
node = "latest"
4-
lefthook = "latest"
5-
yamllint = "latest"
4+
python = "3.14.1"
5+
# linters and tooling
66
actionlint = "latest"
7-
shellcheck = "latest"
8-
markdownlint-cli2 = "latest"
97
jq = "latest"
10-
uv = "latest"
8+
lefthook = "latest"
9+
markdownlint-cli2 = "latest"
10+
ruff = "latest"
11+
shellcheck = "latest"
12+
yamllint = "latest"

.lefthook.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ pre-commit:
2727
- ".github/workflows/*.y*ml"
2828

2929
- name: Ruff Formatting
30-
run: uv run ruff format -q .
30+
run: ruff format -q .
3131
glob:
3232
- "*.py"
3333
stage_fixed: true
3434

3535
- name: Ruff Syntax checking
36-
run: uv run ruff check --fix -q
36+
run: ruff check --fix -q
3737
glob:
3838
- "*.py"
3939
stage_fixed: true

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dependencies = [
2020
[dependency-groups]
2121
dev = [
2222
"mypy>=1.17.1",
23-
"ruff>=0.12.12",
2423
"types-beautifulsoup4>=4.12.0.20250516",
2524
"types-requests>=2.32.4.20250809",
2625
]

uv.lock

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

0 commit comments

Comments
 (0)