diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ede98da..bbd7e19 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,16 +1,16 @@ repos: - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 25.1.0 hooks: - id: black args: [--safe, --quiet] - repo: https://github.com/asottile/blacken-docs - rev: 1.16.0 + rev: 1.19.1 hooks: - id: blacken-docs additional_dependencies: [black==23.1.0] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -21,7 +21,7 @@ repos: exclude: _pytest/(debugging|hookspec).py language_version: python3 - repo: https://github.com/PyCQA/autoflake - rev: v2.2.1 + rev: v2.3.1 hooks: - id: autoflake name: autoflake @@ -29,7 +29,7 @@ repos: language: python files: \.py$ - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.3.0 hooks: - id: flake8 language_version: python3 @@ -39,12 +39,12 @@ repos: - flake8-no-pep420 - flake8-tidy-imports - repo: https://github.com/asottile/reorder-python-imports - rev: v3.10.0 + rev: v3.15.0 hooks: - id: reorder-python-imports args: ['--application-directories=.:src', --py37-plus] - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.20.0 hooks: - id: pyupgrade args: [--py37-plus] diff --git a/django_table_sort/table.py b/django_table_sort/table.py index dc3144f..1ea7b88 100644 --- a/django_table_sort/table.py +++ b/django_table_sort/table.py @@ -115,10 +115,12 @@ def __init__( elif column_names is not None: empty_column_generator = EmptyColumnGenerator() self.column_names = [ - TableColumn(column_name, column_header, headers_css_classes) - if column_name - != empty_column_generator.get_next_empty_column_key_no_add() - else empty_column_generator.get_next_empty_column(column_header) + ( + TableColumn(column_name, column_header, headers_css_classes) + if column_name + != empty_column_generator.get_next_empty_column_key_no_add() + else empty_column_generator.get_next_empty_column(column_header) + ) for column_name, column_header in column_names.items() ] else: @@ -142,12 +144,14 @@ def render(self) -> str: { "body": self.get_table_body(), "headers": self.get_table_headers(), - "table_clases": str(f' class="{self.table_css_clases}"') - if self.table_css_clases is not None - else "", - "table_id": f' id="{self.table_id}"' - if self.table_id is not None - else "", + "table_clases": ( + str(f' class="{self.table_css_clases}"') + if self.table_css_clases is not None + else "" + ), + "table_id": ( + f' id="{self.table_id}"' if self.table_id is not None else "" + ), }, ) @@ -197,11 +201,9 @@ def get_table_headers(self) -> str: """.format( # noqa: F522 remove_sort_url=remove_sort_url, - sort_direction="" - if first_sort - else "-up" - if not descending - else "-down", + sort_direction=( + "" if first_sort else "-up" if not descending else "-down" + ), field_to_sort=field_to_sort, column_name=column_name, ordering_text=f"Sort by {column_name}" if first_sort else "Toggle sort", @@ -267,9 +269,11 @@ def sort_columns(self, field_order: list): empty_column_generator = EmptyColumnGenerator() field_order = [ - field - if field != EMPTY_COLUMN - else empty_column_generator.get_next_empty_column_key() + ( + field + if field != EMPTY_COLUMN + else empty_column_generator.get_next_empty_column_key() + ) for field in field_order ]