chore: switch to Ruff formatter (#1093)

browniebroke · May 21, 2024 · d0b34bb · d0b34bb
1 parent 486e035
commit d0b34bb
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 88 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,10 +36,7 @@ repos:
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
+      - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     hooks:

diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@
   <a href="https://python-poetry.org/">
     <img src="https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json" alt="Poetry">
   </a>
-  <a href="https://github.com/ambv/black">
-    <img src="https://img.shields.io/badge/code%20style-black-000000.svg?amp;style=flat-square" alt="black">
+  <a href="https://github.com/astral-sh/ruff">
+    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
   </a>
   <a href="https://github.com/pre-commit/pre-commit">
     <img src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white&style=flat-square" alt="pre-commit">

diff --git a/src/django_codemod/visitors/models.py b/src/django_codemod/visitors/models.py
@@ -139,7 +139,8 @@ def leave_Return(
         BaseSmallStatement, FlattenSentinel[BaseSmallStatement], RemovalSentinel
     ]:
         if self.visiting_permalink_method and m.matches(
-            updated_node.value, m.Tuple()  # type: ignore
+            updated_node.value,
+            m.Tuple(),  # type: ignore
         ):
             elem_0, *elem_1_3 = updated_node.value.elements[:3]  # type: ignore
             args = (

diff --git a/tests/visitors/test_admin.py b/tests/visitors/test_admin.py
@@ -19,9 +19,7 @@ class TestInlineHasAddPermissionsTransformer(BaseVisitorTest):
         ]
     )
     def test_noop_import_star(self, import_line: str, base_class: str) -> None:
-        before = (
-            after
-        ) = f"""
+        before = after = f"""
             {import_line}
 
             class MyInlineInline(InlineMixin, {base_class}):
@@ -35,9 +33,7 @@ def has_add_permission(self, request):
 
     def test_model_admin_base_class(self) -> None:
         """Doesn't modify if base class doesn't match."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.contrib import admin
 
             class MyAdmin(admin.ModelAdmin):
@@ -51,9 +47,7 @@ def has_add_permission(self, request):
 
     def test_no_base_class(self) -> None:
         """Doesn't modify if there is no base class."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.contrib import admin
 
             class MyCustomStuff:

diff --git a/tests/visitors/test_base.py b/tests/visitors/test_base.py
@@ -278,9 +278,7 @@ def test_kwargs(self) -> None:
         self.assertCodemod(before, after)
 
     def test_avoid_try_import(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             try:
                 from django.dummy.module import func
             except:
@@ -293,9 +291,7 @@ def test_avoid_try_import(self) -> None:
 
     @pytest.mark.usefixtures("parent_module_import_enabled")
     def test_avoid_try_import_parent(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             try:
                 from django.dummy import module
             except:
@@ -308,9 +304,7 @@ def test_avoid_try_import_parent(self) -> None:
 
     @pytest.mark.usefixtures("parent_module_import_enabled")
     def test_parent_import_star(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.dummy import *
 
             result = module.func()
@@ -319,9 +313,7 @@ def test_parent_import_star(self) -> None:
 
     @pytest.mark.usefixtures("parent_module_import_enabled")
     def test_parent_import_not_matches(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.ymmud import other_module
 
             result = other_module.other_func()
@@ -415,9 +407,7 @@ def test_parent_module_import_alias_other_usage(self) -> None:
     @pytest.mark.usefixtures("parent_module_import_enabled")
     def test_parent_module_noop(self) -> None:
         """Parent module imported, but other function used."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.dummy import module
 
             result = module.other_func()
@@ -476,9 +466,7 @@ def test_simple_substitution(self) -> None:
         self.assertCodemod(before, after)
 
     def test_avoid_try_import(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             try:
                 from django.dummy.module import func
             except:

diff --git a/tests/visitors/test_http.py b/tests/visitors/test_http.py
@@ -102,19 +102,15 @@ class TestHttpRequestXReadLinesTransformer(BaseVisitorTest):
 
     def test_noop_wrong_name(self) -> None:
         """Don't replace calls for name other than `request` or `req`."""
-        before = (
-            after
-        ) = """
+        before = after = """
             for line in r.xreadlines():
                 print(line)
         """
         self.assertCodemod(before, after)
 
     def test_noop_function_call(self) -> None:
         """Don't replace calls for name other than `request` or `req`."""
-        before = (
-            after
-        ) = """
+        before = after = """
             for line in xreadlines(r):
                 print(line)
         """
@@ -173,9 +169,7 @@ class TestCookieDateTransformer(BaseVisitorTest):
     transformer = CookieDateTransformer
 
     def test_noop(self):
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.utils.http import http_date
 
             http_date(12345)

diff --git a/tests/visitors/test_models.py b/tests/visitors/test_models.py
@@ -218,9 +218,7 @@ class TestAvailableAttrsTransformer(BaseVisitorTest):
     )
     def test_noop_import_star(self, import_str: str) -> None:
         """Should not try to replace if import star is used."""
-        before = (
-            after
-        ) = f"""
+        before = after = f"""
             {import_str}
 
             class MyModel(models.Model):
@@ -352,9 +350,7 @@ class TestNullBooleanFieldTransformer(BaseVisitorTest):
     transformer = NullBooleanFieldTransformer
 
     def test_noop_models(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.db import models
 
             class MyThing(models.Model):
@@ -363,9 +359,7 @@ class MyThing(models.Model):
         self.assertCodemod(before, after)
 
     def test_noop_fields(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.db.models import BooleanField, Model
 
             class MyThing(Model):

diff --git a/tests/visitors/test_paginator.py b/tests/visitors/test_paginator.py
@@ -7,9 +7,7 @@ class TestQuerySetPaginatorTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.core.paginator import Paginator
 
             paginator_instance = Paginator([], 5)

diff --git a/tests/visitors/test_postgres_fields.py b/tests/visitors/test_postgres_fields.py
@@ -11,9 +11,7 @@ class TestFloatRangeModelFieldTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.contrib.postgres.fields import DecimalRangeField
 
             some_range = DecimalRangeField()
@@ -42,9 +40,7 @@ class TestFloatRangeFormFieldTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.contrib.postgres.forms import DecimalRangeField
 
             some_range = DecimalRangeField()
@@ -73,9 +69,7 @@ class TestJSONModelFieldTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.db.models import JSONField
 
             field = JSONField()

diff --git a/tests/visitors/test_signals.py b/tests/visitors/test_signals.py
@@ -24,9 +24,7 @@ class TestSignalDisconnectWeakTransformer(BaseVisitorTest):
 
     @parameterized.expand(DJANGO_SIGNAL_NAMES)
     def test_noop(self, signal_name):
-        before = (
-            after
-        ) = f"""
+        before = after = f"""
             from django.db.models.signals import {signal_name}
 
             {signal_name}.disconnect(
@@ -40,9 +38,7 @@ def test_noop(self, signal_name):
 
     @parameterized.expand(DJANGO_SIGNAL_NAMES)
     def test_noop_import_star(self, signal_name):
-        before = (
-            after
-        ) = f"""
+        before = after = f"""
             from django.db.models.signals import *
 
             {signal_name}.disconnect(receiver=some_handler, sender=MyModel, weak=True)

diff --git a/tests/visitors/test_template_tags.py b/tests/visitors/test_template_tags.py
@@ -9,9 +9,7 @@ class TestAssignmentTagTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django import template
 
             register = template.Library()
@@ -32,9 +30,7 @@ def some_tag():
     )
     def test_noop_not_imported(self, import_line: str) -> None:
         """Test when import is missing."""
-        before = (
-            after
-        ) = f"""
+        before = after = f"""
             {import_line}
 
             @register.assignment_tag
@@ -46,9 +42,7 @@ def some_tag():
 
     def test_noop_import_star(self) -> None:
         """Test when imported as star import."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django import *
 
             register = template.Library()
@@ -138,9 +132,7 @@ def some_tag():
 
     def test_noop_content_star_import(self) -> None:
         """Test when Library class is imported as star import."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from django.template import *
 
             register = Library()

diff --git a/tests/visitors/test_timezone.py b/tests/visitors/test_timezone.py
@@ -7,9 +7,7 @@ class TestFixedOffsetTransformer(BaseVisitorTest):
 
     def test_noop(self) -> None:
         """Test when nothing should change."""
-        before = (
-            after
-        ) = """
+        before = after = """
             from datetime import timedelta, timezone
 
             timezone(offset=timedelta(minutes=60))
@@ -78,9 +76,7 @@ def test_with_name_args(self) -> None:
         self.assertCodemod(before, after)
 
     def test_issue_421(self) -> None:
-        before = (
-            after
-        ) = """
+        before = after = """
         from django.utils import timezone
 
         now = timezone.now()