Skip to content

Commit 98ca4b3

Browse files
lukasvinclavlukasvinclav
authored
feat: ruff format (#196)
1 parent 43806e5 commit 98ca4b3

File tree

5 files changed

+21
-39
lines changed

5 files changed

+21
-39
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ repos:
99
- id: check-toml
1010
- id: end-of-file-fixer
1111
- id: trailing-whitespace
12-
- repo: https://github.com/psf/black
13-
rev: 23.10.1
14-
hooks:
15-
- id: black
1612
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.1.4
13+
rev: v0.1.5
1814
hooks:
1915
- id: ruff
16+
args:
17+
- --fix
18+
- id: ruff-format
2019
- repo: https://github.com/compilerla/conventional-pre-commit
2120
rev: v2.4.0
2221
hooks:

‎pyproject.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ pytest = "^7.3.1"
3434
pytest-django = "^4.5.2"
3535
tox = "^4.5.2"
3636

37-
[tool.black]
38-
target-version = ["py38", "py39", "py310", "py311", "py312"]
39-
4037
[tool.ruff]
4138
fix = true
4239
line-length = 88
@@ -47,6 +44,7 @@ select = [
4744
"I", # isort
4845
"C", # flake8-comprehensions
4946
"B", # flake8-bugbear
47+
"UP", # pyupgrade
5048
]
5149
ignore = [
5250
"E501", # line too long, handled by black

‎src/unfold/checks.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ def _check_unfold_action_permission_methods(self, obj: Any) -> List[checks.Error
3434
if not hasattr(obj, method_name):
3535
errors.append(
3636
checks.Error(
37-
"%s must define a %s() method for the %s action."
38-
% (
37+
"{} must define a {}() method for the {} action.".format(
3938
obj.__class__.__name__,
4039
method_name,
4140
action.method.__name__,

‎src/unfold/contrib/filters/admin.py‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
107107
if value_from is not None and value_from != "":
108108
filters.update(
109109
{
110-
self.parameter_name
111-
+ "__gte": self.used_parameters.get(
110+
self.parameter_name + "__gte": self.used_parameters.get(
112111
self.parameter_name + "_from", None
113112
),
114113
}
@@ -118,8 +117,7 @@ def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
118117
if value_to is not None and value_to != "":
119118
filters.update(
120119
{
121-
self.parameter_name
122-
+ "__lte": self.used_parameters.get(
120+
self.parameter_name + "__lte": self.used_parameters.get(
123121
self.parameter_name + "_to", None
124122
),
125123
}
@@ -144,12 +142,10 @@ def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
144142
"form": RangeNumericForm(
145143
name=self.parameter_name,
146144
data={
147-
self.parameter_name
148-
+ "_from": self.used_parameters.get(
145+
self.parameter_name + "_from": self.used_parameters.get(
149146
self.parameter_name + "_from", None
150147
),
151-
self.parameter_name
152-
+ "_to": self.used_parameters.get(
148+
self.parameter_name + "_to": self.used_parameters.get(
153149
self.parameter_name + "_to", None
154150
),
155151
},
@@ -261,12 +257,10 @@ def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
261257
"form": self.form_class(
262258
name=self.parameter_name,
263259
data={
264-
self.parameter_name
265-
+ "_from": self.used_parameters.get(
260+
self.parameter_name + "_from": self.used_parameters.get(
266261
self.parameter_name + "_from", min_value
267262
),
268-
self.parameter_name
269-
+ "_to": self.used_parameters.get(
263+
self.parameter_name + "_to": self.used_parameters.get(
270264
self.parameter_name + "_to", max_value
271265
),
272266
},
@@ -321,8 +315,7 @@ def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
321315
if value_from not in EMPTY_VALUES:
322316
filters.update(
323317
{
324-
self.parameter_name
325-
+ "__gte": self.used_parameters.get(
318+
self.parameter_name + "__gte": self.used_parameters.get(
326319
self.parameter_name + "_from", None
327320
),
328321
}
@@ -332,8 +325,7 @@ def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
332325
if value_to not in EMPTY_VALUES:
333326
filters.update(
334327
{
335-
self.parameter_name
336-
+ "__lte": self.used_parameters.get(
328+
self.parameter_name + "__lte": self.used_parameters.get(
337329
self.parameter_name + "_to", None
338330
),
339331
}
@@ -358,12 +350,10 @@ def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
358350
"form": self.form_class(
359351
name=self.parameter_name,
360352
data={
361-
self.parameter_name
362-
+ "_from": self.used_parameters.get(
353+
self.parameter_name + "_from": self.used_parameters.get(
363354
self.parameter_name + "_from", None
364355
),
365-
self.parameter_name
366-
+ "_to": self.used_parameters.get(
356+
self.parameter_name + "_to": self.used_parameters.get(
367357
self.parameter_name + "_to", None
368358
),
369359
},
@@ -466,20 +456,16 @@ def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
466456
"form": self.form_class(
467457
name=self.parameter_name,
468458
data={
469-
self.parameter_name
470-
+ "_from_0": self.used_parameters.get(
459+
self.parameter_name + "_from_0": self.used_parameters.get(
471460
self.parameter_name + "_from_0", None
472461
),
473-
self.parameter_name
474-
+ "_from_1": self.used_parameters.get(
462+
self.parameter_name + "_from_1": self.used_parameters.get(
475463
self.parameter_name + "_from_1", None
476464
),
477-
self.parameter_name
478-
+ "_to_0": self.used_parameters.get(
465+
self.parameter_name + "_to_0": self.used_parameters.get(
479466
self.parameter_name + "_to_0", None
480467
),
481-
self.parameter_name
482-
+ "_to_1": self.used_parameters.get(
468+
self.parameter_name + "_to_1": self.used_parameters.get(
483469
self.parameter_name + "_to_1", None
484470
),
485471
},

‎src/unfold/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242

4343

44-
@lru_cache()
44+
@lru_cache
4545
def get_config(settings_name=None):
4646
if settings_name is None:
4747
settings_name = "UNFOLD"

0 commit comments

Comments
 (0)