Skip to content

Commit 5943c95

Browse files
committed
Finish migrating to uv
The transformation was incomplete. And combine the lint and fmt goals into a single lint goal.
1 parent 2105e37 commit 5943c95

File tree

5 files changed

+12
-33
lines changed

5 files changed

+12
-33
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ help:
1010
clean:
1111
bin/clean.sh
1212

13-
lint:
14-
bin/lint.sh
13+
check:
14+
@bin/check.sh
1515

16-
fmt:
17-
bin/fmt.sh
16+
lint: check
17+
bin/lint.sh
1818

19-
test:
19+
test: check
2020
bin/test.sh
2121

2222
docs:
2323
cd doc && $(MAKE) html
2424

25-
dist: clean
25+
dist: check clean
2626
uv run python -m build
2727

2828
.PHONY: tests

bin/check.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#!/bin/sh
22

3-
case "$CONDA_PREFIX" in
4-
*/pyimagej-dev)
5-
;;
6-
*)
7-
echo "Please run 'make setup' and then 'mamba activate pyimagej-dev' first."
8-
exit 1
9-
;;
10-
esac
3+
if ! command -v uv >/dev/null 2>&1; then
4+
echo "Please install uv (https://docs.astral.sh/uv/getting-started/installation/)."
5+
exit 1
6+
fi

bin/fmt.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

bin/lint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ dir=$(dirname "$0")
44
cd "$dir/.."
55

66
exitCode=0
7-
uv run ruff check
7+
uv run ruff check --fix
88
code=$?; test $code -eq 0 || exitCode=$code
9-
uv run ruff format --check
9+
uv run ruff format
1010
code=$?; test $code -eq 0 || exitCode=$code
1111
uv run validate-pyproject pyproject.toml
1212
code=$?; test $code -eq 0 || exitCode=$code

bin/setup.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)