Skip to content

Commit

Permalink
👷 Use ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
Freed-Wu committed Feb 16, 2024
1 parent 96c3711 commit 7166c31
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 55 deletions.
33 changes: 9 additions & 24 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,40 +65,25 @@ repos:
- mdformat-toc
- mdformat-deflist
- mdformat-beautysh
- mdformat-black
- mdformat-ruff
- ruff
- mdformat-config
- mdformat-web
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.10.0
rev: v0.12.1
hooks:
- id: markdownlint-cli2
additional_dependencies:
- markdown-it-texmath
- repo: https://github.com/psf/black
rev: 23.11.0
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/pycqa/pydocstyle
rev: 6.3.0
hooks:
- id: pydocstyle
additional_dependencies:
- tomli
- id: ruff
- id: ruff-format
- repo: https://github.com/kumaraditya303/mirrors-pyright
rev: v1.1.335
rev: v1.1.350
hooks:
- id: pyright
- repo: https://github.com/PyCQA/bandit
rev: 1.7.5
hooks:
- id: bandit
args:
- -cpyproject.toml
additional_dependencies:
- tomli

ci:
skip:
Expand Down
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
https://www.sphinx-doc.org/en/master/usage/configuration.html
"""

from autotools_language_server import __version__ as version # type: ignore
from autotools_language_server._metainfo import ( # type: ignore
author,
Expand Down
43 changes: 24 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,32 +76,37 @@ file = "templates/metainfo.py.j2"
[tool.mdformat]
number = true

[tool.black]
[tool.doq]
template_path = "templates"

[tool.ruff]
line-length = 79

[tool.isort]
line_length = 79
profile = "black"
[tool.ruff.lint]
select = [
# pycodestyle
"E",
# pyflakes
"F",
# pyupgrade
"UP",
# flake8-bugbear
"B",
# flake8-simplify
"SIM",
# isort
"I",
]
ignore = ["D205", "D400"]
preview = true

# https://github.com/PyCQA/pydocstyle/issues/418
[tool.pydocstyle]
add_ignore = "D205, D400"

[tool.doq]
template_path = "templates"
[tool.ruff.format]
docstring-code-format = true
preview = true

[tool.coverage.report]
exclude_lines = [
"if TYPE_CHECKING:",
"if __name__ == .__main__.:",
"\\s*import tomli as tomllib",
]

[tool.bandit.assert_used]
skips = ["*_test.py", "*/test_*.py"]

[tool.cibuildwheel]
archs = ["all"]
skip = "*37-* *38-* *39-*"
before-test = "pip install -rrequirements.txt -rrequirements/dev.txt"
test-command = "pytest {project}"
1 change: 1 addition & 0 deletions src/autotools_language_server/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Provide ``__version__`` for
`importlib.metadata.version() <https://docs.python.org/3/library/importlib.metadata.html#distribution-versions>`_.
"""

from typing import Literal

try:
Expand Down
4 changes: 2 additions & 2 deletions src/autotools_language_server/__main__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
r"""This module can be called by
`python -m <https://docs.python.org/3/library/__main__.html>`_.
"""

from argparse import ArgumentParser, RawDescriptionHelpFormatter
from contextlib import suppress
from datetime import datetime

from . import FILETYPE
from . import FILETYPE, __version__
from . import __name__ as NAME
from . import __version__

NAME = NAME.replace("_", "-")
VERSION = rf"""{NAME} {__version__}
Expand Down
1 change: 0 additions & 1 deletion src/autotools_language_server/assets/queries/define.scm
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@
(variable_reference
(word) @variable.call
)
; ex: filetype=query
1 change: 0 additions & 1 deletion src/autotools_language_server/assets/queries/include.scm
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
) @include
(#match? @include "^include")
)
; ex: filetype=query
1 change: 1 addition & 0 deletions src/autotools_language_server/finders.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Finders
===========
"""

import os
from dataclasses import dataclass

Expand Down
1 change: 1 addition & 0 deletions src/autotools_language_server/misc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Misc
========
"""

from typing import Any


Expand Down
6 changes: 5 additions & 1 deletion src/autotools_language_server/misc/autoconf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Autoconf
============
"""

from typing import Any

from tree_sitter_lsp.misc import get_info
Expand Down Expand Up @@ -71,7 +72,10 @@ def init_schema() -> dict[str, dict[str, Any]]:
"""
filetype = "config"
schema = {
"$id": f"{SOURCE}/blob/main/src/termux_language_server/assets/json/{filetype}.json",
"$id": (
f"{SOURCE}/blob/main/"
f"src/termux_language_server/assets/json/{filetype}.json"
),
"$schema": "http://json-schema.org/draft-07/schema#",
"$comment": (
"Don't edit this file directly! It is generated by "
Expand Down
6 changes: 5 additions & 1 deletion src/autotools_language_server/misc/make.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Make
========
"""

from typing import Any

from tree_sitter_lsp.misc import get_info
Expand Down Expand Up @@ -69,7 +70,10 @@ def init_schema() -> dict[str, dict[str, Any]]:
"""
filetype = "make"
schema = {
"$id": f"{SOURCE}/blob/main/src/termux_language_server/assets/json/{filetype}.json",
"$id": (
f"{SOURCE}/blob/main/"
f"src/termux_language_server/assets/json/{filetype}.json"
),
"$schema": "http://json-schema.org/draft-07/schema#",
"$comment": (
"Don't edit this file directly! It is generated by "
Expand Down
1 change: 1 addition & 0 deletions src/autotools_language_server/server.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Server
==========
"""

import re
from typing import Any

Expand Down
3 changes: 2 additions & 1 deletion src/autotools_language_server/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
r"""Utils
=========
"""

import json
import os
from typing import Any, Literal
Expand Down Expand Up @@ -54,7 +55,7 @@ def get_schema(filetype: FILETYPE) -> dict[str, Any]:
),
f"{filetype}.json",
)
with open(file, "r") as f:
with open(file) as f:
SCHEMAS[filetype] = json.load(f)
return SCHEMAS[filetype]

Expand Down
4 changes: 2 additions & 2 deletions tests/test_finders.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
r"""Test finders."""

import os

from autotools_language_server.finders import DefinitionFinder
from tree_sitter_languages import get_parser
from tree_sitter_lsp import UNI

from autotools_language_server.finders import DefinitionFinder

PATH = os.path.dirname(__file__)


Expand Down
6 changes: 3 additions & 3 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
r"""Test utils"""
import os

from tree_sitter_languages import get_parser
from tree_sitter_lsp.diagnose import check
import os

from autotools_language_server.finders import DIAGNOSTICS_FINDER_CLASSES
from autotools_language_server.utils import get_filetype, get_schema
from tree_sitter_languages import get_parser
from tree_sitter_lsp.diagnose import check

PATH = os.path.dirname(__file__)

Expand Down

0 comments on commit 7166c31

Please sign in to comment.