Convert formatting to use ruff instead of yapf + isort (#26247)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
GitHub
127
pyproject.toml
127
pyproject.toml
@ -52,27 +52,106 @@ lora_filesystem_resolver = "vllm.plugins.lora_resolvers.filesystem_resolver:regi
|
||||
where = ["."]
|
||||
include = ["vllm*"]
|
||||
|
||||
[tool.yapfignore]
|
||||
ignore_patterns = [
|
||||
".buildkite/**",
|
||||
"benchmarks/**",
|
||||
"build/**",
|
||||
"examples/**",
|
||||
]
|
||||
|
||||
[tool.ruff]
|
||||
# Allow lines to be as long as 80.
|
||||
line-length = 80
|
||||
|
||||
[tool.ruff.lint.per-file-ignores]
|
||||
"vllm/third_party/**" = ["ALL"]
|
||||
"vllm/version.py" = ["F401"]
|
||||
"vllm/_version.py" = ["ALL"]
|
||||
# Python 3.8 typing - skip V0 code
|
||||
"vllm/attention/**/*.py" = ["UP006", "UP035"]
|
||||
"vllm/engine/**/*.py" = ["UP006", "UP035"]
|
||||
"vllm/executor/**/*.py" = ["UP006", "UP035"]
|
||||
"vllm/worker/**/*.py" = ["UP006", "UP035"]
|
||||
# TEMPORARY! These ignores will be fixed forward
|
||||
## Line length violations
|
||||
"csrc/cutlass_extensions/vllm_cutlass_library_extension.py" = ["E501"]
|
||||
"tests/compile/piecewise/test_simple.py" = ["E501"]
|
||||
"tests/compile/piecewise/test_toy_llama.py" = ["E501", "B023"]
|
||||
"tests/entrypoints/conftest.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_audio.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_chat.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_chat_template.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_chat_with_tool_reasoning.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_completion_with_function_calling.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_video.py" = ["E501"]
|
||||
"tests/entrypoints/openai/test_vision.py" = ["E501"]
|
||||
"tests/entrypoints/test_chat_utils.py" = ["E501"]
|
||||
"tests/kernels/moe/modular_kernel_tools/common.py" = ["E501"]
|
||||
"tests/models/language/generation/test_gemma.py" = ["E501"]
|
||||
"tests/models/language/generation/test_mistral.py" = ["E501"]
|
||||
"tests/models/multimodal/generation/test_ultravox.py" = ["E501"]
|
||||
"tests/models/multimodal/generation/test_voxtral.py" = ["E501"]
|
||||
"tests/models/multimodal/generation/vlm_utils/custom_inputs.py" = ["E501"]
|
||||
"tests/tool_use/test_tool_choice_required.py" = ["E501"]
|
||||
"tests/v1/attention/utils.py" = ["E501"]
|
||||
"tests/v1/entrypoints/openai/responses/test_image.py" = ["E501"]
|
||||
"tests/v1/kv_connector/nixl_integration/test_accuracy.py" = ["E501"]
|
||||
"tests/v1/kv_connector/unit/test_offloading_connector.py" = ["E501"]
|
||||
"tests/v1/logits_processors/test_custom_offline.py" = ["E501"]
|
||||
"vllm/attention/ops/pallas_kv_cache_update.py" = ["E501"]
|
||||
"vllm/compilation/collective_fusion.py" = ["E501"]
|
||||
"vllm/compilation/wrapper.py" = ["E501"]
|
||||
"vllm/config/vllm.py" = ["E501"]
|
||||
"vllm/distributed/device_communicators/all2all.py" = ["E501"]
|
||||
"vllm/entrypoints/openai/protocol.py" = ["E501"]
|
||||
"vllm/lora/layers/vocal_parallel_embedding.py" = ["E501"]
|
||||
"vllm/model_executor/model_loader/bitsandbytes_loader.py" = ["E501"]
|
||||
"vllm/model_executor/models/bailing_moe.py" = ["E501"]
|
||||
"vllm/model_executor/models/hyperclovax_vision.py" = ["E501"]
|
||||
"vllm/model_executor/models/llama4_eagle.py" = ["E501"]
|
||||
"vllm/model_executor/models/longcat_flash_mtp.py" = ["E501"]
|
||||
"vllm/model_executor/models/phi4mm.py" = ["E501"]
|
||||
"vllm/model_executor/models/qwen3_next.py" = ["E501"]
|
||||
"vllm/model_executor/layers/quantization/ptpc_fp8.py" = ["E501"]
|
||||
"vllm/v1/attention/backends/mla/common.py" = ["E501"]
|
||||
"vllm/v1/engine/utils.py" = ["E501"]
|
||||
"vllm/v1/utils.py" = ["E501"]
|
||||
"vllm/v1/worker/gpu_model_runner.py" = ["E501"]
|
||||
## Simplification rules
|
||||
"tests/distributed/test_expert_placement.py" = ["SIM108"]
|
||||
"tests/kernels/attention/test_cutlass_mla_decode.py" = ["SIM108"]
|
||||
"tests/kernels/attention/test_flashmla.py" = ["SIM108"]
|
||||
"tests/kernels/attention/test_lightning_attn.py" = ["SIM108"]
|
||||
"tests/kernels/moe/test_pplx_moe.py" = ["SIM108"]
|
||||
"tests/kernels/quantization/test_cutlass_scaled_mm.py" = ["SIM108"]
|
||||
"tests/kernels/test_onednn.py" = ["SIM108"]
|
||||
"tests/kernels/utils.py" = ["SIM108"]
|
||||
"tests/multimodal/test_processing.py" = ["SIM108"]
|
||||
"vllm/attention/ops/triton_reshape_and_cache_flash.py" = ["SIM108"]
|
||||
"vllm/distributed/parallel_state.py" = ["SIM108"]
|
||||
"vllm/entrypoints/chat_utils.py" = ["SIM108"]
|
||||
"vllm/entrypoints/llm.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/batch_invariant.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/fla/ops/chunk_o.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/fused_moe/fused_moe.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/fused_moe/layer.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/fused_moe/modular_kernel.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/fused_moe/rocm_aiter_fused_moe.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/layernorm.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/lightning_attn.py" = ["SIM108"]
|
||||
"vllm/model_executor/layers/quantization/compressed_tensors/compressed_tensors.py" = ["SIM103"]
|
||||
"vllm/model_executor/layers/quantization/compressed_tensors/utils.py" = ["SIM110"]
|
||||
"vllm/model_executor/layers/quantization/quark/utils.py" = ["SIM110"]
|
||||
"vllm/utils/__init__.py" = ["SIM108"]
|
||||
"vllm/v1/sample/ops/bad_words.py" = ["SIM108"]
|
||||
"vllm/v1/sample/rejection_sampler.py" = ["SIM108"]
|
||||
"vllm/v1/worker/tpu_model_runner.py" = ["SIM108"]
|
||||
"vllm/_custom_ops.py" = ["SIM108"]
|
||||
"tools/profiler/print_layerwise_table.py" = ["SIM118"]
|
||||
## Loop variable binding issues
|
||||
"tests/kernels/mamba/test_mamba_ssm_ssd.py" = ["B023"]
|
||||
## Type annotation modernization and other rules
|
||||
"vllm/attention/backends/abstract.py" = ["UP035", "UP006"]
|
||||
"vllm/attention/layer.py" = ["UP035", "UP006"]
|
||||
"vllm/attention/layers/chunked_local_attention.py" = ["UP035", "UP006"]
|
||||
"vllm/attention/ops/flashmla.py" = ["UP035", "UP006"]
|
||||
"vllm/attention/ops/paged_attn.py" = ["UP035", "UP006"]
|
||||
"vllm/engine/arg_utils.py" = ["UP035", "UP006"]
|
||||
"vllm/engine/metrics.py" = ["UP035", "UP006"]
|
||||
"vllm/engine/metrics_types.py" = ["UP035", "UP006"]
|
||||
"vllm/executor/executor_base.py" = ["UP035", "UP006"]
|
||||
"vllm/executor/msgspec_utils.py" = ["UP035", "UP006"]
|
||||
"vllm/executor/ray_distributed_executor.py" = ["UP035", "UP006", "SIM108", "SIM112"]
|
||||
"vllm/executor/ray_utils.py" = ["UP035", "UP006"]
|
||||
"vllm/executor/uniproc_executor.py" = ["UP035", "UP006"]
|
||||
"vllm/model_executor/layers/fused_moe/flashinfer_trtllm_moe.py" = ["UP035"]
|
||||
## Type comparison issues
|
||||
"vllm/multimodal/inputs.py" = ["E721"]
|
||||
# End of temporary ignores
|
||||
|
||||
[tool.ruff.lint]
|
||||
select = [
|
||||
@ -87,7 +166,7 @@ select = [
|
||||
# flake8-simplify
|
||||
"SIM",
|
||||
# isort
|
||||
# "I",
|
||||
"I",
|
||||
# flake8-logging-format
|
||||
"G",
|
||||
]
|
||||
@ -104,21 +183,15 @@ ignore = [
|
||||
"UP007",
|
||||
]
|
||||
|
||||
[tool.ruff.format]
|
||||
docstring-code-format = true
|
||||
|
||||
[tool.mypy]
|
||||
plugins = ['pydantic.mypy']
|
||||
ignore_missing_imports = true
|
||||
check_untyped_defs = true
|
||||
follow_imports = "silent"
|
||||
|
||||
[tool.isort]
|
||||
skip_glob = [
|
||||
".buildkite/*",
|
||||
"benchmarks/*",
|
||||
"examples/*",
|
||||
]
|
||||
use_parentheses = true
|
||||
skip_gitignore = true
|
||||
|
||||
[tool.pytest.ini_options]
|
||||
markers = [
|
||||
"slow_test",
|
||||
|
||||
Reference in New Issue
Block a user