Skip to content

Commit a31c029

Browse files
author
spencer@primus
committed
Run formatting
1 parent 608521d commit a31c029

5 files changed

Lines changed: 20 additions & 21 deletions

File tree

Makefile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NAME := avstack
22
INSTALL_STAMP := .install.stamp
3-
POETRY := $(shell command -v poetry 2> /dev/null)
3+
UV := $(shell command -v uv 2> /dev/null)
44
PYFOLDERS := avstack tests third_party/mmdetection/CUSTOM third_party/mmdetection3d/CUSTOM
55
.DEFAULT_GOAL := help
66

@@ -17,10 +17,9 @@ help:
1717
@echo "Check the Makefile to know exactly what each target is doing."
1818

1919
install: $(INSTALL_STAMP)
20-
$(INSTALL_STAMP): pyproject.toml poetry.lock
21-
@if [ -z $(POETRY) ]; then echo "Poetry could not be found. See https://python-poetry.org/docs/"; exit 2; fi
22-
# $(POETRY) install --all-extras
23-
$(POETRY) install
20+
$(INSTALL_STAMP): pyproject.toml uv.lock
21+
@if [ -z $(UV) ]; then echo "uv could not be found. See https://docs.astral.sh/uv/"; exit 2; fi
22+
# $(UV) sync --all-extras
2423
touch $(INSTALL_STAMP)
2524

2625
.PHONY: clean
@@ -30,18 +29,18 @@ clean:
3029

3130
.PHONY: lint
3231
lint: $(INSTALL_STAMP)
33-
$(POETRY) run isort --profile=black --lines-after-imports=2 --check-only $(PYFOLDERS)
34-
$(POETRY) run black --check $(PYFOLDERS) --diff
35-
$(POETRY) run flake8 --ignore=W503,E501 $(PYFOLDERS)
36-
$(POETRY) run mypy $(PYFOLDERS) --ignore-missing-imports
37-
$(POETRY) run bandit -r $(NAME) -s B608
32+
$(UV) run isort --profile=black --lines-after-imports=2 --check-only $(PYFOLDERS)
33+
$(UV) run black --check $(PYFOLDERS) --diff
34+
$(UV) run flake8 --ignore=W503,E501 $(PYFOLDERS)
35+
$(UV) run mypy $(PYFOLDERS) --ignore-missing-imports
36+
$(UV) run bandit -r $(NAME) -s B608
3837

3938
.PHONY: format
4039
format: $(INSTALL_STAMP)
41-
$(POETRY) run autoflake --remove-all-unused-imports -i -r $(PYFOLDERS) --exclude=__init__.py
42-
$(POETRY) run isort --profile=black --lines-after-imports=2 $(PYFOLDERS)
43-
$(POETRY) run black $(PYFOLDERS)
40+
$(UV) run autoflake --remove-all-unused-imports -i -r $(PYFOLDERS) --exclude=__init__.py
41+
$(UV) run isort --profile=black --lines-after-imports=2 $(PYFOLDERS)
42+
$(UV) run black $(PYFOLDERS)
4443

4544
.PHONY: test
4645
test: $(INSTALL_STAMP)
47-
$(POETRY) run pytest ./tests/ --cov-report term-missing --cov-fail-under 0 --cov $(NAME)
46+
$(UV) run pytest ./tests/ --cov-report term-missing --cov-fail-under 0 --cov $(NAME)

avstack/modules/perception/fov_estimator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(
4040
max_height: float = np.inf,
4141
name: str = "fov_estimator",
4242
*args,
43-
**kwargs
43+
**kwargs,
4444
):
4545
super().__init__(name=name, *args, **kwargs)
4646
self.concavity = concavity
@@ -78,7 +78,7 @@ def __init__(
7878
smoothing: float = None,
7979
name: str = "fov_estimator",
8080
*args,
81-
**kwargs
81+
**kwargs,
8282
):
8383
"""Uses ray tracing to estimate a field of view from lidar data
8484
@@ -111,7 +111,7 @@ def __call__(
111111
in_global: bool = False,
112112
centering: bool = True,
113113
*args: Any,
114-
**kwds: Any
114+
**kwds: Any,
115115
) -> "Polygon":
116116
"""Common call method for ray trace fov estimators"""
117117
# project into BEV

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ docs = [
7474
"mkdocs-material~=9.0",
7575
]
7676
test = [
77-
"pytest>=7,<8",
7877
"pytest-cov>=4,<5",
7978
"bandit~=1.7",
8079
"black~=22.12.0",
8180
"mypy>=0,<1",
8281
"isort~=5.11",
8382
"flake8~=5.0",
8483
"autoflake>=1,<2",
84+
"pytest>=7.4.4",
8585
]
8686

8787
[tool.uv]

uv.lock

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

0 commit comments

Comments
 (0)