Use ruff

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11.x"]
-        toxenv: [pep8, isort, black, pypi-description, docs, towncrier]
+        toxenv: [ruff, isort, black, pypi-description, docs, towncrier]
     steps:
     - uses: actions/checkout@v3
       with:

.pre-commit-config.yaml

@@ -6,6 +6,7 @@ repos:
     rev: v4.4.0
     hooks:
       - id: trailing-whitespace
+        exclude: "setup.cfg"
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
@@ -21,39 +22,21 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: 'v0.0.262'
     hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-broken-line
-          - flake8-bugbear
-          - flake8-builtins
-          - flake8-coding
-          - flake8-commas
-          - flake8-comprehensions
-          - flake8-eradicate
-          - flake8-quotes
-          - flake8-tidy-imports
-          - pep8-naming
-  - repo: https://github.com/econchick/interrogate
-    rev: 1.5.0
-    hooks:
-      - id: interrogate
-        args:
-          - "-cpyproject.toml"
-          - "--quiet"
+      - id: ruff
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1
     hooks:
       - id: pyupgrade
         args:
           - --py3-plus
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: "1.12.0"
+    rev: "1.13.0"
     hooks:
       - id: django-upgrade
         args: [--target-version, "3.2"]
@@ -65,7 +48,6 @@ repos:
         language: system
         pass_filenames: false
         always_run: true
-
 ci:
   skip:
     - towncrier

djangocms_blog/migrations/0002_post_sites.py

@@ -12,7 +12,8 @@ class Migration(migrations.Migration):
             model_name="post",
             name="sites",
             field=models.ManyToManyField(
-                help_text="Select sites in which to show the post. If none is set it will bevisible in all the configured sites.",
+                help_text="Select sites in which to show the post. If none is set it will be "
+                "visible in all the configured sites.",
                 to="sites.Site",
                 null=True,
                 verbose_name="Site(s",

djangocms_blog/migrations/0003_auto_20141201_2252.py

@@ -11,7 +11,8 @@ class Migration(migrations.Migration):
             model_name="post",
             name="sites",
             field=models.ManyToManyField(
-                help_text="Select sites in which to show the post. If none is set it will be visible in all the configured sites.",
+                help_text="Select sites in which to show the post. If none is set it will "
+                "be visible in all the configured sites.",
                 to="sites.Site",
                 null=True,
                 verbose_name="Site(s)",

djangocms_blog/migrations/0006_auto_20150214_1907.py

@@ -1,5 +1,5 @@
 import djangocms_text_ckeditor.fields
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

djangocms_blog/migrations/0008_auto_20150814_0831.py

@@ -1,5 +1,5 @@
 import djangocms_text_ckeditor.fields
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

djangocms_blog/migrations/0009_latestpostsplugin_tags_new.py

@@ -1,6 +1,6 @@
 import taggit_autosuggest.managers
 from django.contrib.contenttypes.models import ContentType
-from django.db import migrations, models
+from django.db import migrations
 
 
 def migrate_tags(apps, schema_editor):
@@ -18,7 +18,7 @@ def migrate_tags(apps, schema_editor):
 
 def migrate_tags_reverse(apps, schema_editor):
     LatestPostsPlugin = apps.get_model("djangocms_blog", "LatestPostsPlugin")
-    Tag = apps.get_model("taggit", "Tag")
+    apps.get_model("taggit", "Tag")
     TaggedItem = apps.get_model("taggit", "TaggedItem")
     plugin_content_type = ContentType.objects.get_for_model(LatestPostsPlugin)
     for tagged in TaggedItem.objects.filter(content_type_id=plugin_content_type.pk):

djangocms_blog/migrations/0010_auto_20150923_1151.py

@@ -144,7 +144,8 @@ class Migration(migrations.Migration):
             name="sites",
             field=models.ManyToManyField(
                 to="sites.Site",
-                help_text="Select sites in which to show the post. If none is set it will be visible in all the configured sites.",
+                help_text="Select sites in which to show the post. "
+                "If none is set it will be visible in all the configured sites.",
                 blank=True,
                 verbose_name="Site(s)",
             ),

djangocms_blog/migrations/0012_auto_20151220_1734.py

@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

djangocms_blog/migrations/0014_auto_20160215_1331.py

@@ -1,6 +1,6 @@
 from cms.models import Page
 from cms.utils.i18n import get_language_list
-from django.db import migrations, models
+from django.db import migrations
 
 
 def forwards(apps, schema_editor):
@@ -17,9 +17,7 @@ def forwards(apps, schema_editor):
         if not BlogConfigTranslation.objects.exists():
             for lang in get_language_list():
                 title = page.get_title(lang)
-                translation = BlogConfigTranslation.objects.create(
-                    language_code=lang, master_id=config.pk, app_title=title
-                )
+                BlogConfigTranslation.objects.create(language_code=lang, master_id=config.pk, app_title=title)
     if config:
         for model in (Post, BlogCategory, GenericBlogPlugin, LatestPostsPlugin, AuthorEntriesPlugin):
             for item in model.objects.filter(app_config__isnull=True):

djangocms_blog/migrations/0017_thumbnail_move.py

@@ -1,6 +1,4 @@
-from django.db import migrations, models
-
-from djangocms_blog.models import thumbnail_model
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

djangocms_blog/migrations/0019_thumbnail_move3.py

@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 from djangocms_blog.models import thumbnail_model
 

djangocms_blog/migrations/0020_thumbnail_move4.py

@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 from djangocms_blog.models import thumbnail_model
 

djangocms_blog/migrations/0021_post_liveblog.py

@@ -1,5 +1,5 @@
 import cms.models.fields
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

djangocms_blog/migrations/0022_auto_20160605_2305.py

@@ -1,6 +1,5 @@
 # Generated by Django 1.9.7 on 2016-06-05 21:05
 
-import django.db.models.deletion
 from django.db import migrations, models
 
 

djangocms_blog/migrations/0034_merge.py

@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

pyproject.toml

@@ -4,8 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 119
-target-version = ["py36"]
-include = 'djangocms_blog/*py'
+target-version = ["py310"]
 
 [tool.towncrier]
 package = "djangocms_blog"

tasks.py

@@ -26,7 +26,7 @@ def clean(c):
 @task
 def lint(c):
     """Run linting tox environments."""
-    c.run("tox -epep8,isort,black,pypi-description")
+    c.run("tox -eruff,isort,black,pypi-description")
 
 
 @task  # NOQA

tests/test_utils/migrations/0001_initial.py

@@ -34,7 +34,8 @@ class Migration(migrations.Migration):
                         validators=[
                             django.core.validators.RegexValidator(
                                 "^[\\w.@+-]+$",
-                                "Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.",
+                                "Enter a valid username. This value may contain only letters, "
+                                "numbers and @/./+/-/_ characters.",
                                 "invalid",
                             )
                         ],
@@ -57,15 +58,17 @@ class Migration(migrations.Migration):
                     "is_active",
                     models.BooleanField(
                         verbose_name="active",
-                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        help_text="Designates whether this user should be treated as active. "
+                        "Unselect this instead of deleting accounts.",
                         default=True,
                     ),
                 ),
                 ("date_joined", models.DateTimeField(verbose_name="date joined", default=django.utils.timezone.now)),
                 (
                     "groups",
                     models.ManyToManyField(
-                        help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+                        help_text="The groups this user belongs to. A user will get all "
+                        "permissions granted to each of their groups.",
                         related_query_name="user",
                         related_name="user_set",
                         verbose_name="groups",

tox.ini

@@ -5,7 +5,7 @@ envlist =
     docs
     isort
     isort_format
-    pep8
+    ruff
     pypi-description
     towncrier
     py{311,310,39}-django{42,41}-cms{311}
@@ -36,23 +36,13 @@ passenv =
     COMMAND
     PYTEST_*
 
-[testenv:pep8]
+[testenv:ruff]
 commands =
-    {envpython} -m flake8 djangocms_blog tests
+    {envpython} -m ruff check djangocms_blog tests {posargs}
     {envpython} -minterrogate -c pyproject.toml djangocms_blog tests
 deps =
     interrogate
-    flake8
-    flake8-broken-line
-    flake8-bugbear
-    flake8-builtins
-    flake8-coding
-    flake8-commas
-    flake8-comprehensions
-    flake8-eradicate
-    flake8-quotes
-    flake8-tidy-imports
-    pep8-naming
+    ruff
 skip_install = true
 
 [testenv:isort]