From 39149ef564efc3b2abe28ed333c2cc1c1f784e5c Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Wed, 6 Mar 2024 13:36:25 +0100 Subject: [PATCH] build: remove isort Import sorting now handled by ruff. --- .pre-commit-config.yaml | 6 ------ CONTRIBUTING.md | 2 +- Makefile | 2 -- pyproject.toml | 5 ----- requirements.dev.txt | 1 - 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af408ed5..76bcfa82 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,12 +12,6 @@ repos: hooks: - id: black language_version: python3 - - repo: https://github.com/pycqa/isort - rev: 5.13.1 - hooks: - - id: isort - name: isort (cython) - types: [cython] - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.1.7 hooks: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5fbed843..a83b8c82 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -82,7 +82,7 @@ The following steps are tested on an Ubuntu system. $ make test_all # run all the tests, report all the errors ``` -9. Format your code. We use ```black``` for code and ```isort``` for ```import``` formatting. +9. Format your code. We use ```black``` for code formatting. ```bash $ make style diff --git a/Makefile b/Makefile index d1a1db8a..2204bca8 100644 --- a/Makefile +++ b/Makefile @@ -46,12 +46,10 @@ test_failed: ## only run tests failed the last time. style: ## update code style. black ${target_dirs} - isort ${target_dirs} lint: ## run linters. ruff ${target_dirs} black ${target_dirs} --check - isort ${target_dirs} --check-only system-deps: ## install linux system deps sudo apt-get install -y libsndfile1-dev diff --git a/pyproject.toml b/pyproject.toml index 934e0c2e..1cdcc0ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,8 +64,3 @@ max-returns = 7 [tool.black] line-length = 120 target-version = ['py39'] - -[tool.isort] -line_length = 120 -profile = "black" -multi_line_output = 3 diff --git a/requirements.dev.txt b/requirements.dev.txt index 21c4c3d2..4b3c3cfd 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,5 +1,4 @@ black coverage -isort nose2 ruff==0.1.3