Skip to content

Commit 18108fd

Browse files
author
Lennard Wolf
committed
fix: correct use of uvx
1 parent 13f928d commit 18108fd

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,44 +35,44 @@ bootstrap-dev: ## set up a fresh dev environment
3535
setup-pre-commit: in-venv ## install pre-commit hooks
3636
# installing pre-commit hooks...
3737
pre-commit autoupdate
38-
pre-commit install && $(VENV)/pre-commit install --hook-type commit-msg
38+
pre-commit install && pre-commit install --hook-type commit-msg
3939
.PHONY: setup-pre-commit
4040

41-
setup-docs: ## install docs dependencies
41+
setup-docs: in-venv ## install docs dependencies
4242
# installing docs dependencies...
4343
@npm install
4444
.PHONY: setup-docs
4545

46-
build-docs: setup-docs ## build docs
46+
build-docs: in-venv ## build docs
4747
# building docs...
4848
@npm run docs:build
4949
.PHONY: build-docs
5050

51-
update: ## update lock file if needed
51+
update: in-venv ## update lock file if needed
5252
uv pip install --upgrade uv
53-
$(VENV)/pdm run update-all
54-
$(VENV)/pre-commit autoupdate
53+
pdm run update-all
54+
pre-commit autoupdate
5555
.PHONY: update
5656

57-
lint: in-venv dev ## Run linter on python files
58-
$(VENV)/pdm run lint
57+
lint: in-venv ## Run linter on python files
58+
pdm run lint
5959
.PHONY: lint
6060

61-
format: in-venv dev ## Run formatter on python files
61+
format: in-venv ## Run formatter on python files
6262
format:
63-
$(VENV)/pdm run format
63+
pdm run format
6464
.PHONY: format
6565

66-
mypy: ## Run mypy on python files
67-
$(VENV)/pdm run mypy
66+
mypy: in-venv ## Run mypy on python files
67+
pdm run mypy
6868
.PHONY: mypy
6969

7070
test: in-venv dev ## Run unit tests
71-
$(VENV)/pdm run test
71+
pdm run test
7272
.PHONY: test
7373

7474
ci: in-venv dev ## Run formatter, linter, mypy, and unit tests
75-
$(VENV)/pdm run ci
75+
pdm run ci
7676
.PHONY: ci
7777

7878
.DEFAULT_GOAL := help

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,24 @@ update-all = {shell = """ \
104104
# CI: format, lint, mypy, test
105105
format = {shell = """ \
106106
printf 'Formatting...' \
107-
&& .venv/bin/ruff --config=./pyproject.toml fix src/ tests/ \
107+
&& uvx ruff --config=./pyproject.toml fix src/ tests/ \
108108
&& printf '\t\t\n' || printf '\t\t\n' \
109109
"""}
110110
lint = {shell = """ \
111111
printf 'Linting...' \
112-
&& .venv/bin/ruff check --config=./pyproject.toml src/ tests/ \
112+
&& uvx ruff check --config=./pyproject.toml src/ tests/ \
113113
&& printf '\t\t\n' || printf '\t\t\n' \
114114
"""}
115115
mypy = {shell = """ \
116116
printf 'Type-checking...' \
117-
&& .venv/bin/mypy -v --no-error-summary --install-types --config-file=./pyproject.toml \
117+
&& uvx mypy -v --no-error-summary --install-types --config-file=./pyproject.toml \
118118
&& printf '\t\n' || printf '\t\n' \
119119
"""}
120120
test = {shell = """ \
121121
printf 'Running tests...' \
122-
&& .venv/bin/coverage run -m pytest tests/ --show-capture=log -p no:logging -p no:warnings \
123-
&& .venv/bin/coverage report \
124-
&& .venv/bin/coverage-badge -o docs/public/img/coverage.svg -f \
122+
&& uvx coverage run -m pytest tests/ --show-capture=log -p no:logging -p no:warnings \
123+
&& uvx coverage report \
124+
&& uvx coverage-badge -o docs/public/img/coverage.svg -f \
125125
"""}
126126
ci = {shell = """ \
127127
pdm run format; \
@@ -242,7 +242,7 @@ skip-magic-trailing-comma = false
242242
# Like Black, automatically detect the appropriate line ending.
243243
line-ending = "auto"
244244

245-
[tool.ruff.per-file-ignores]
245+
[tool.ruff.lint.per-file-ignores]
246246
"tests/**/*.py" = [
247247
"S101", # asserts allowed in tests...
248248
"FBT", # don"t care about booleans as positional arguments in tests

0 commit comments

Comments
 (0)