Skip to content

Commit

Permalink
build: remove isort
Browse files Browse the repository at this point in the history
We use ruff to check and enforce import order now.
  • Loading branch information
h4l committed Sep 21, 2024
1 parent 02b56ec commit 6449674
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 28 deletions.
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ RUN --mount=source=.,target=/workspace,rw \
poetry run ruff format --check --diff .


FROM lint-setup AS lint-isort
RUN --mount=source=.,target=/workspace,rw \
poetry run isort --check --diff .


FROM lint-setup AS lint-mypy
RUN --mount=source=.,target=/workspace,rw \
--mount=type=cache,target=.mypy_cache \
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ check-code-issues:
> ruff check src test
.PHONY: check-code-issues

check-code-import-order:
> isort --check --diff src test
.PHONY: check-code-import-order

check-code-format:
> ruff format --check src test
.PHONY: check-code-format
Expand All @@ -63,6 +59,5 @@ reformat-code:
> @if [[ "$$(git status --porcelain)" != "" ]]; then
> echo "Refusing to reformat code: files have uncommitted changes" >&2 ; exit 1
> fi
> isort src test
> black src test
> ruff format src test
.PHONY: reformat-code
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ target "test_package" {
target "lint" {
name = "lint-${lint_type}"
matrix = {
lint_type = ["check", "format", "isort", "mypy"],
lint_type = ["check", "format", "mypy"],
}
args = {
PYTHON_VER = "slim"
Expand Down
16 changes: 1 addition & 15 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ packaging = ">=14.5" # this version introduces the VERSION_PATTERN constant
exceptiongroup = { version = "^1", python = "<3.11" }
hypothesis = "^6.108.8"
pytest = "^7"
isort = "^5.13.2"
mypy = "^1.11.1"
frozendict = "^2.4.4"
pytest-cov = "^5.0.0"
Expand Down

0 comments on commit 6449674

Please sign in to comment.