Mise à jour de pyupgrade et Black

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ env:
   PYTHON_VERSION: "3.7"
   MARIADB_VERSION: "10.4.10"
   COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt
-  BLACK_VERSION: "21.12b0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml
+  BLACK_VERSION: "22.3.0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml
 
   # As GitHub Action does not allow environment variables
   # to be used in services definitions, these are only for

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.10.0
+    rev: v2.31.0
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
   - repo: https://github.com/psf/black
-    rev: 21.12b0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml
+    rev: 22.3.0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml
     hooks:
       - id: black
         language_version: python3

pyproject.toml

@@ -1,5 +1,6 @@
 [tool.black]
 line-length = 120
+target-version = ["py37", "py38", "py39", "py310"]
 extend-exclude = """
 ^/doc
 """

requirements-dev.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 
-black==21.12b0  # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml
+black==22.3.0  # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml
 colorlog==6.6.0
 django-debug-toolbar==3.2.4
 django-extensions==3.1.5

zds/forum/models.py

@@ -21,7 +21,7 @@
 def sub_tag(tag):
     start = tag.group("start")
     end = tag.group("end")
-    return "{}".format(start + end)
+    return f"{start + end}"
 
 
 class ForumCategory(models.Model):

zds/forum/tests/tests_views.py

@@ -560,7 +560,7 @@ def test_success_edit_topic_solved_by_author(self):
         self.assertEqual(302, response.status_code)
         topic = Topic.objects.get(pk=topic.pk)
         self.assertTrue(topic.is_solved)
-        self.assertEquals(topic.solved_by, profile.user)
+        self.assertEqual(topic.solved_by, profile.user)
 
     def test_success_edit_topic_solved_by_staff(self):
         staff = StaffProfileFactory()
@@ -576,7 +576,7 @@ def test_success_edit_topic_solved_by_staff(self):
         self.assertEqual(302, response.status_code)
         topic = Topic.objects.get(pk=topic.pk)
         self.assertTrue(topic.is_solved)
-        self.assertEquals(topic.solved_by, staff.user)
+        self.assertEqual(topic.solved_by, staff.user)
 
     def test_failure_edit_topic_lock_by_user(self):
         profile = ProfileFactory()

zds/gallery/models.py

@@ -33,7 +33,7 @@ def image_path(instance, filename):
     :rtype: unicode
     """
     ext = filename.split(".")[-1].lower()
-    filename = "{}.{}".format(str(uuid4()), ext)
+    filename = f"{str(uuid4())}.{ext}"
 
     return os.path.join("galleries", str(instance.gallery.pk), filename)
 

zds/gallery/tests/factories.py

@@ -10,7 +10,7 @@ class Meta:
         model = Image
 
     title = factory.Sequence("titre de l'image {}".format)
-    slug = factory.LazyAttribute(lambda o: "{}".format(old_slugify(o.title)))
+    slug = factory.LazyAttribute(lambda o: f"{old_slugify(o.title)}")
     legend = factory.Sequence("legende de l'image {}".format)
     physical = factory.django.ImageField(color="blue")
 
@@ -31,7 +31,7 @@ class Meta:
 
     title = factory.Sequence("titre de la gallerie {}".format)
     subtitle = factory.Sequence("Sous-titre de la gallerie {}".format)
-    slug = factory.LazyAttribute(lambda o: "{}".format(old_slugify(o.title)))
+    slug = factory.LazyAttribute(lambda o: f"{old_slugify(o.title)}")
 
     @classmethod
     def _generate(cls, create, attrs):

zds/notification/tests/tests_tricky.py

@@ -108,7 +108,7 @@ def test_edit_with_more_than_max_ping(self):
             {
                 "title": "Super sujet",
                 "subtitle": "Pour tester les notifs",
-                "text": "@{} @{} are pinged".format(pinged_users[1].user.username, pinged_users[3].user.username),
+                "text": f"@{pinged_users[1].user.username} @{pinged_users[3].user.username} are pinged",
                 "tags": "",
             },
             follow=False,

zds/searchv2/forms.py

@@ -19,7 +19,7 @@ class SearchForm(forms.Form):
     )
 
     choices = sorted(
-        [(k, v[0]) for k, v in settings.ZDS_APP["search"]["search_groups"].items()], key=lambda pair: pair[1]
+        ((k, v[0]) for k, v in settings.ZDS_APP["search"]["search_groups"].items()), key=lambda pair: pair[1]
     )
 
     models = forms.MultipleChoiceField(

zds/searchv2/models.py

@@ -555,7 +555,7 @@ def es_bulk_indexing_of_model(self, model, force_reindexing=False):
                         if abs(1 - ratio) > 0.1:
                             objects_per_batch = int(objects_per_batch * ratio)
                             if force_reindexing:
-                                print("     {}x, new batch size: {}".format(round(ratio, 2), objects_per_batch))
+                                print(f"     {round(ratio, 2)}x, new batch size: {objects_per_batch}")
                         prev_obj_per_sec = obj_per_sec
 
                     # fetch next batch

zds/settings/prod.py

@@ -83,7 +83,7 @@ def _get_version():
     if git_version is None:
         return __version__
     else:
-        return "{}/{}".format(__version__, git_version[:7])
+        return f"{__version__}/{git_version[:7]}"
 
 
 sentry_sdk.init(

zds/tutorialv2/management/commands/migrate_to_zep25.py

@@ -121,7 +121,7 @@ def update_categories(self):
                 sub = SubCategory()
                 sub.title = subcategory[0]
                 sub.subtitle = subcategory[1]
-                sub.slug = slugify("{}".format(subcategory[0]))
+                sub.slug = slugify(f"{subcategory[0]}")
                 sub.save()
                 self.stdout.write(f'[ZEP-25] : New subcategory "{sub}" added')
                 catsubcat = CategorySubCategory()

zds/tutorialv2/managers.py

@@ -25,7 +25,7 @@ def __get_list(self, subcategories=None, tags=None, content_type=None, with_comm
             if not isinstance(content_type, list):
                 content_type = [content_type]
             content_type = filter(None, content_type)
-            queryset = queryset.filter(content_type__in=list([c.upper() for c in content_type]))
+            queryset = queryset.filter(content_type__in=list(c.upper() for c in content_type))
 
         # prefetch:
         queryset = (

zds/tutorialv2/models/versioned.py

@@ -140,7 +140,7 @@ def get_tree_level(self):
         elif isinstance(self.children[0], Extract):
             return 2
         else:
-            return 1 + max([i.get_tree_level() for i in self.children])
+            return 1 + max(i.get_tree_level() for i in self.children)
 
     def has_child_with_path(self, child_path):
         """Return ``True`` if this container has a child matching the given

zds/tutorialv2/publish_container.py

@@ -31,7 +31,7 @@ def publish_container_new(
     rendered,
     template="tutorialv2/export/chapter.html",
     file_ext="html",
-    **ctx
+    **ctx,
 ):
     """
     Generate the browser-diplay or epub of a content and its possible hierarchy
@@ -128,7 +128,7 @@ def publish_container(
     template="tutorialv2/export/chapter.html",
     file_ext="html",
     image_callback=None,
-    **ctx
+    **ctx,
 ):
     """'Publish' a given container, in a recursive way
     Only here for epub publication (complexity of image/path traversal for the archive to be built)
@@ -221,7 +221,7 @@ def publish_container(
                 file_ext=file_ext,
                 image_callback=image_callback,
                 template=template,
-                **ctx
+                **ctx,
             )
             path_to_title_dict.update(result)
         if container.conclusion and container.get_conclusion():

zds/tutorialv2/tests/factories.py

@@ -101,7 +101,7 @@ class ContainerFactory(factory.Factory):
     class Meta:
         model = Container
 
-    title = factory.Sequence(lambda n: "Mon container No{}".format(n + 1))
+    title = factory.Sequence(lambda n: f"Mon container No{n + 1}")
 
     @classmethod
     def _generate(cls, create, attrs):
@@ -139,7 +139,7 @@ class ExtractFactory(factory.Factory):
     class Meta:
         model = Extract
 
-    title = factory.Sequence(lambda n: "Mon extrait No{}".format(n + 1))
+    title = factory.Sequence(lambda n: f"Mon extrait No{n + 1}")
 
     @classmethod
     def _generate(cls, create, attrs):

zds/tutorialv2/tests/tests_views/tests_editcontentlicense.py

@@ -56,7 +56,7 @@ def test_authenticated_outsider(self):
         """Test that on form submission, unauthorized users get a 403."""
         self.client.force_login(self.outsider)
         response = self.client.post(self.form_url, self.form_data)
-        self.assertEquals(response.status_code, 403)
+        self.assertEqual(response.status_code, 403)
 
 
 @override_for_contents()

zds/tutorialv2/tests/tests_views/tests_editcontenttags.py

@@ -55,7 +55,7 @@ def test_authenticated_outsider(self):
         """Test that on form submission, unauthorized users get a 403."""
         self.client.force_login(self.outsider)
         response = self.client.post(self.form_url, self.form_data)
-        self.assertEquals(response.status_code, 403)
+        self.assertEqual(response.status_code, 403)
 
 
 @override_for_contents()

zds/tutorialv2/tests/tests_views/tests_published.py

@@ -553,7 +553,7 @@ def test_add_note(self):
 
         # test quoting (without JS)
         result = self.client.get(
-            reverse("content:add-reaction") + "?pk={}&cite={}".format(self.published.content.pk, reactions[0].pk)
+            reverse("content:add-reaction") + f"?pk={self.published.content.pk}&cite={reactions[0].pk}"
         )
         self.assertEqual(result.status_code, 200)
 
@@ -565,7 +565,7 @@ def test_add_note(self):
 
         # test quoting (with JS)
         result = self.client.get(
-            reverse("content:add-reaction") + "?pk={}&cite={}".format(self.published.content.pk, reactions[0].pk),
+            reverse("content:add-reaction") + f"?pk={self.published.content.pk}&cite={reactions[0].pk}",
             HTTP_X_REQUESTED_WITH="XMLHttpRequest",
         )
 
@@ -1151,9 +1151,7 @@ def test_quote_note(self):
         self.assertEqual(404, result.status_code)
 
         # cite not existing note just gives the form empty
-        result = self.client.get(
-            reverse("content:add-reaction") + "?pk={}&cite={}".format(tuto.pk, 99999999), follow=True
-        )
+        result = self.client.get(reverse("content:add-reaction") + f"?pk={tuto.pk}&cite={99999999}", follow=True)
         self.assertEqual(200, result.status_code)
 
         self.assertTrue("text" not in result.context["form"])  # nothing quoted, so no text cited

zds/tutorialv2/views/beta.py

@@ -42,7 +42,7 @@ def _create_beta_topic(self, msg, beta_version, _type, tags):
         max_len = Topic._meta.get_field("title").max_length
 
         while i < len(tags) and len(topic_title) + len(_tags) + len(tags[i].title) + 2 < max_len:
-            _tags += "[{}]".format(tags[i])
+            _tags += f"[{tags[i]}]"
             i += 1
         forum = get_object_or_404(Forum, pk=settings.ZDS_APP["forum"]["beta_forum_id"])
         topic = create_topic(

zds/tutorialv2/views/misc.py

@@ -105,7 +105,7 @@ def get_form_kwargs(self):
     def form_valid(self, form):
         user = self.request.user
         authors = list(Profile.objects.contactable_members().filter(user__in=self.object.authors.all()))
-        authors = list([author.user for author in authors])
+        authors = list(author.user for author in authors)
 
         # check if the warn is done on a public or beta version :
         is_public = False

zds/utils/context_processor.py

@@ -12,7 +12,7 @@ def get_version():
     Retrieve version informations from `zds/_version.py`.
     """
     if git_version is not None:
-        name = "{}/{}".format(__version__, git_version[:7])
+        name = f"{__version__}/{git_version[:7]}"
         url = get_repository_url(settings.ZDS_APP["github_projects"]["default_repository"], "base_url")
         return {"name": name, "url": f"{url}/tree/{git_version}"}
     else:

zds/utils/forms.py

@@ -29,7 +29,7 @@ def __init__(self, *args, **kwargs):
             HTML("</div>"),
             HTML("</div>"),
             *args,
-            **kwargs
+            **kwargs,
         )
 
 
@@ -52,7 +52,7 @@ def __init__(self, *args, send_label="Envoyer", display_save=False, **kwargs):
                 ),
             ),
             *args,
-            **kwargs
+            **kwargs,
         )
 
 

zds/utils/management/commands/clean_tags.py

@@ -15,7 +15,7 @@ def title_pk(tag):
             return f'"{tag.title}" ({tag.pk})'
 
         def replace(tag_to_delete, tag_to_use_instead):
-            self.stdout.write("Replacing {} with {}".format(title_pk(tag_to_delete), title_pk(tag_to_use_instead)))
+            self.stdout.write(f"Replacing {title_pk(tag_to_delete)} with {title_pk(tag_to_use_instead)}")
 
             topics = Topic.objects.filter(tags__pk=tag_to_delete["pk"])
             for topic in topics:
@@ -29,7 +29,7 @@ def replace(tag_to_delete, tag_to_use_instead):
                 content.tags.add(tag_to_use_instead.pk)
                 content.tags.remove(tag_to_delete["pk"])
 
-            self.stdout.write("    Deleting {}".format(title_pk(tag_to_delete)))
+            self.stdout.write(f"    Deleting {title_pk(tag_to_delete)}")
             Tag.objects.get(pk=tag_to_delete["pk"]).delete()
 
         self.stdout.write(self.help)
@@ -57,4 +57,4 @@ def replace(tag_to_delete, tag_to_use_instead):
                 stripped = Tag.objects.get(pk=tag["pk"])
                 stripped.name = tag["stripped"]
                 stripped.save()
-                self.stdout.write("Stripped {} to {}".format(title_pk(tag), title_pk(stripped)))
+                self.stdout.write(f"Stripped {title_pk(tag)} to {title_pk(stripped)}")