mirror of
https://github.com/rr-/pq-cli.git
synced 2026-11-12 22:40:36 -07:00
build: replace black and isort with ruff
ruff format keeps black's style at the same line length, and ruff check covers import sorting plus pycodestyle and pyflakes. Three comments and a test regex are wrapped to fit 79 columns.
This commit is contained in:
8 files changed
+21
-24
No files matched your search
@@ -1,11 +1,8 @@
|
||||
repos:
|
||||
|
||||
- repo: https://github.com/pycqa/isort
|
||||
rev: 5.13.2
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.17.1
|
||||
hooks:
|
||||
- id: isort
|
||||
additional_dependencies: [toml]
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 24.4.2
|
||||
hooks:
|
||||
- id: black
|
||||
- id: ruff-check
|
||||
args: [--fix]
|
||||
- id: ruff-format
|
||||
+2
-1
@@ -923,7 +923,8 @@ def monster_task(
|
||||
result = monster.name
|
||||
lev = monster.level
|
||||
else:
|
||||
# pick the monster out of so many random ones closest to the level we want
|
||||
# pick the monster out of so many random ones closest to the level
|
||||
# we want
|
||||
monster = unnamed_monster(data, level, iterations=5)
|
||||
result = monster.name
|
||||
lev = monster.level
|
||||
|
||||
@@ -143,10 +143,8 @@ class CursesUserInterface(BaseUserInterface):
|
||||
view.on_cancel += lambda: self._switch_to_create_char_race_view(
|
||||
player_name, race
|
||||
)
|
||||
view.on_confirm += (
|
||||
lambda class_: self._switch_to_create_char_stats_view(
|
||||
player_name, race, class_
|
||||
)
|
||||
view.on_confirm += lambda class_: (
|
||||
self._switch_to_create_char_stats_view(player_name, race, class_)
|
||||
)
|
||||
self._switch_view(view)
|
||||
|
||||
|
||||
@@ -61,6 +61,6 @@ class CharacterSheetWindow(Focusable, DataTableProgressBarWindow):
|
||||
self._cur_pos = self._player.exp_bar.position
|
||||
self._max_pos = self._player.exp_bar.max_
|
||||
self._progress_title = (
|
||||
f"Experience ({self._max_pos-self._cur_pos:.0f} XP to go)"
|
||||
f"Experience ({self._max_pos - self._cur_pos:.0f} XP to go)"
|
||||
)
|
||||
self._render_progress_bar()
|
||||
@@ -24,9 +24,7 @@ LOGO = """
|
||||
█▄▄▀ █▀▀ ▄▀▀▄ ▄▀▀▄ █▀▀ ▄▀▀▄ ▄▀▀▀ ▄▀▀▀ █ █ █ █ ▄▀▀▄ ▄▀▀▀ ▀█▀
|
||||
█ █ █ █ ▀▄▄█ █ █▀▀ ▀▀▄ ▀▀▄ █ ▌█ █ █ █▀▀ ▀▀▄ █
|
||||
▀ ▀ ▀▀ ▄▄▀ ▀ ▀▀ ▀▀▀ ▀▀▀ ▀▀▌ ▀▀ ▀▀ ▀▀▀ ▀
|
||||
""".strip(
|
||||
"\n"
|
||||
)
|
||||
""".strip("\n")
|
||||
|
||||
|
||||
class MainMenu(Menu):
|
||||
|
||||
@@ -71,7 +71,8 @@ class DataTable(Scrollable):
|
||||
self._pad.addnstr(y, 0, row[0], min(len(row[0]), w))
|
||||
# Determine the number of characters to write
|
||||
nwrite = min(len(row[1]), w - col2_x)
|
||||
# Ensure we have enough columns, and we are writing more than zero
|
||||
# Ensure we have enough columns, and we are writing more
|
||||
# than zero
|
||||
if col2_x < w and nwrite > 0:
|
||||
self._pad.addnstr(y, col2_x, row[1], nwrite)
|
||||
if y == self._selected and has_colors():
|
||||
|
||||
+6
-5
@@ -42,10 +42,11 @@ build-backend = "hatchling.build"
|
||||
[dependency-groups]
|
||||
dev = ["pre-commit>=2.16.0", "pytest>=8.0"]
|
||||
|
||||
[tool.black]
|
||||
[tool.ruff]
|
||||
line-length = 79
|
||||
|
||||
[tool.isort]
|
||||
known_first_party = "pqcli"
|
||||
multi_line_output = 3
|
||||
include_trailing_comma = true
|
||||
[tool.ruff.lint]
|
||||
select = ["E", "F", "W", "I"]
|
||||
|
||||
[tool.ruff.lint.isort]
|
||||
known-first-party = ["pqcli"]
|
||||
@@ -129,7 +129,8 @@ def test_impressive_guy_formats() -> None:
|
||||
titles = "|".join(re.escape(title) for title in data.impressive_titles)
|
||||
races = "|".join(re.escape(plural(race.name)) for race in data.races)
|
||||
pattern = re.compile(
|
||||
rf"the ({titles}) of the ({races})|({titles}) [A-Z][a-z]+ of [A-Z][a-z]+"
|
||||
rf"the ({titles}) of the ({races})"
|
||||
rf"|({titles}) [A-Z][a-z]+ of [A-Z][a-z]+"
|
||||
)
|
||||
random.seed("guys")
|
||||
guys = [impressive_guy(data) for _ in range(200)]
|
||||
|
||||
Reference in new issue
Block a user