Skip to content

Commit

Permalink
chore: replace autoflake/flake8/isort with ruff
Browse files Browse the repository at this point in the history
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
  • Loading branch information
jfcherng committed Nov 16, 2023
1 parent 8380176 commit f0ebe1c
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
- name: Do linting
run: |
make check
make ci-check
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Jack Cherng <jfcherng@gmail.com>
Copyright (c) 2022-2023 Jack Cherng <jfcherng@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 10 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
.PHONY: all
all: fix
all:

.PHONY: install
install:
pip install -U -r requirements.txt
python -m pip install -U pip -r requirements.txt

.PHONY: check
check:
.PHONY: ci-check
ci-check:
mypy -p plugin
flake8 .
black --check --diff --preview .
isort --check --diff .
ruff check --diff --preview .
black --diff --preview --check .

.PHONY: fix
fix:
autoflake --in-place .
.PHONY: ci-fix
ci-fix:
ruff check --preview --fix .
# ruff format --preview .
black --preview .
isort .
58 changes: 28 additions & 30 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,6 @@ module = ["plugin.libs.*"]
ignore_errors = true
ignore_missing_imports = true

[tool.isort]
line_length = 120
profile = 'black'
py_version = 38
skip_glob = [
".venv/**",
"br-*/**",
"branch-*/**",
"libs/**",
"plugin/libs/**",
"stubs/**",
"typings/**",
"vendor/**",
"venv/**",
]

[tool.autoflake]
quiet = true
recursive = true
remove-all-unused-imports = true
exclude = '\.git,\.?venv,\.mypy_cache,br-.*,branch-.*,libs,stubs,tests/files,typings'

[tool.black]
preview = true
line-length = 120
Expand All @@ -52,18 +30,38 @@ exclude = '''
[tool.pyright]
include = ['./']
exclude = [
'**/__pycache__/',
'**/node_modules/',
# git-related
'**/.git/',
'**/br-*/',
'**/branch-*/',
'**/__pycache__/',
'**/node_modules/',
# git-related
'**/.git/',
'**/br-*/',
'**/branch-*/',
]
ignore = ['**/.venv', '**/libs']
stubPath = 'typings'
pythonVersion = '3.8'

[tool.ruff]
select = ["E", "F", "W"]
preview = true
select = ["E", "F", "W", "I"]
ignore = ["E203"]
line-length = 120
target-version = 'py38'
target-version = 'py312'
exclude = [
".git",
".mypy_cache",
".venv",
".venv-*",
"branch-*",
"libs",
"plugin/libs",
"stubs",
"tests/files",
"typings",
"vendor",
"venv",
"venv-*",
]

[tool.ruff.per-file-ignores]
"boot.py" = ["E402"]
4 changes: 1 addition & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# This is an implicit value, here for clarity
--index https://pypi.python.org/simple/

autoflake
black
flake8
isort
mypy
ruff
16 changes: 0 additions & 16 deletions tox.ini

This file was deleted.

0 comments on commit f0ebe1c

Please sign in to comment.