diff options
| author |  Chris Lovering <[email protected]> | 2023-11-06 10:36:13 +0000 |
|---|---|---|
| committer | Chris Lovering <[email protected]> | 2023-11-06 10:42:00 +0000 |
| commit | 16692534cc23f581d89d3e0e1d5b0f7c21c1ab2f (patch) | |
| tree | 7a0589bbbf089025d31139faa126724a3dee42c1 | |
| parent | Enable unsafe-fixes and preview for ruff (diff) | |
Use ruff's isort implementation
| -rw-r--r-- | .pre-commit-config.yaml | 8 | ||||
| -rw-r--r-- | poetry.lock | 19 | ||||
| -rw-r--r-- | pyproject.toml | 10 |
3 files changed, 8 insertions, 29 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3fdd30bf..33674845 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,14 +11,6 @@ repos: - repo: local hooks: - - id: isort - name: isort - description: This hook runs isort within our project's environment. - entry: poetry run isort - language: system - types: [python] - require_serial: true - - id: ruff name: ruff description: Run ruff linting diff --git a/poetry.lock b/poetry.lock index 5285ee0b..307892a4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -636,23 +636,6 @@ files = [ ] [[package]] -name = "isort" -version = "5.12.0" -description = "A Python utility / library to sort Python imports." -optional = false -python-versions = ">=3.8.0" -files = [ - {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, - {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, -] - -[package.extras] -colors = ["colorama (>=0.4.3)"] -pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] -plugins = ["setuptools"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] - -[[package]] name = "lupa" version = "2.0" description = "Python wrapper around Lua and LuaJIT" @@ -1811,4 +1794,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "3.11.*" -content-hash = "39c8b05926d68b94666aae5175987b4d1c3b5ebaec22f0a373acbc930e945529" +content-hash = "3c023a0b870cb2a6b1a77afc6375cb410d4a2dd925dc9cd7cf6c0e7b011fe8ea" diff --git a/pyproject.toml b/pyproject.toml index 040732a4..1a70cfa0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,6 @@ pydantic = { version = "1.10.9", extras = ["dotenv"]} [tool.poetry.dev-dependencies] -isort = "5.12.0" pip-licenses = "4.3.3" pre-commit = "3.5.0" python-dotenv = "1.0.0" @@ -39,7 +38,6 @@ taskipy = "1.12.0" start = "python -m bot" lint = "pre-commit run --all-files" precommit = "pre-commit install" -isort = "isort ." [build-system] requires = ["poetry-core>=1.0.0"] @@ -70,6 +68,12 @@ ignore = [ "SIM102", "SIM108", ] line-length = 120 -select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"] +select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "I", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"] unsafe-fixes = true preview = true + +[tool.ruff.isort] +known-first-party = ["bot"] +order-by-type = false +case-sensitive = true +combine-as-imports = true |