From 7b7e5e54ae19ff6b7b770db9e9491392dd89d8f3 Mon Sep 17 00:00:00 2001 From: Raffaella <45825990+raffaellasuardini@users.noreply.github.com> Date: Tue, 20 Feb 2024 21:10:22 +0100 Subject: [PATCH] Solved rules (#518) * fix ruff rule I001 * fix ruff rule E501 * fix ruff rule C408 * removed extend-ignore list from pyproject.toml * chore: ruff reformatted * chore: trim trailing whitespace * chore: create extend-exclude section * Add SVG to ruff exclude --------- Co-authored-by: Mark Walker --- djangocms_admin_style/__init__.py | 5 +- .../locale/de/LC_MESSAGES/django.po | 2 +- .../locale/es/LC_MESSAGES/django.po | 2 +- .../locale/fr/LC_MESSAGES/django.po | 2 +- .../locale/it/LC_MESSAGES/django.po | 2 +- .../locale/lt/LC_MESSAGES/django.po | 2 +- .../locale/ru/LC_MESSAGES/django.po | 2 +- .../locale/uk/LC_MESSAGES/django.po | 2 +- .../sass/libs/html5-boilerplate/_reset.scss | 2 +- .../fonts/django-admin-icons.svg | 10 +- .../templates/admin/inc/branding.html | 2 +- .../templatetags/admin_style_tags.py | 23 ++-- pyproject.toml | 18 +-- setup.py | 91 +++++++------- tests/settings-docker.py | 112 ++++++++---------- tests/settings.py | 27 +++-- tests/test_migrations.py | 17 ++- tests/test_templatetags.py | 29 +++-- 18 files changed, 175 insertions(+), 175 deletions(-) diff --git a/djangocms_admin_style/__init__.py b/djangocms_admin_style/__init__.py index 7c8bc7f0..42be157a 100644 --- a/djangocms_admin_style/__init__.py +++ b/djangocms_admin_style/__init__.py @@ -3,7 +3,8 @@ Release logic: 1. Increase version number (change __version__ below). - 2. Ensure the static bundle is upto date with ``nvm use && gulp icons && gulp sass bundle`` + 2. Ensure the static bundle is upto date with + ``nvm use && gulp icons && gulp sass bundle`` 3. Assure that all changes have been documented in CHANGELOG.rst. 4. In setup.py check that - versions from all third party packages are pinned in ``REQUIREMENTS``. @@ -16,4 +17,4 @@ 10. Publish the release when ready 11. Github actions will publish the new package to pypi """ -__version__ = '3.3.0' +__version__ = "3.3.0" diff --git a/djangocms_admin_style/locale/de/LC_MESSAGES/django.po b/djangocms_admin_style/locale/de/LC_MESSAGES/django.po index 60ce3021..145f7645 100644 --- a/djangocms_admin_style/locale/de/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/de/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Angelo Dini , 2016 diff --git a/djangocms_admin_style/locale/es/LC_MESSAGES/django.po b/djangocms_admin_style/locale/es/LC_MESSAGES/django.po index 4e760d40..34a8ea77 100644 --- a/djangocms_admin_style/locale/es/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/es/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Paulo , 2015 diff --git a/djangocms_admin_style/locale/fr/LC_MESSAGES/django.po b/djangocms_admin_style/locale/fr/LC_MESSAGES/django.po index 365b9d46..f9a7cf93 100644 --- a/djangocms_admin_style/locale/fr/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/fr/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Frigory33 , 2016 diff --git a/djangocms_admin_style/locale/it/LC_MESSAGES/django.po b/djangocms_admin_style/locale/it/LC_MESSAGES/django.po index 5c849e61..564d4bda 100644 --- a/djangocms_admin_style/locale/it/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/it/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # yakky , 2015 diff --git a/djangocms_admin_style/locale/lt/LC_MESSAGES/django.po b/djangocms_admin_style/locale/lt/LC_MESSAGES/django.po index 302f3aa0..adfa6e84 100644 --- a/djangocms_admin_style/locale/lt/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/lt/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Matas Dailyda , 2015 diff --git a/djangocms_admin_style/locale/ru/LC_MESSAGES/django.po b/djangocms_admin_style/locale/ru/LC_MESSAGES/django.po index 9cf72834..9ab33613 100644 --- a/djangocms_admin_style/locale/ru/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/ru/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Mikhail Kolesnik , 2015 diff --git a/djangocms_admin_style/locale/uk/LC_MESSAGES/django.po b/djangocms_admin_style/locale/uk/LC_MESSAGES/django.po index d3fe7b79..8edba8cd 100644 --- a/djangocms_admin_style/locale/uk/LC_MESSAGES/django.po +++ b/djangocms_admin_style/locale/uk/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Mikhail Kolesnik , 2015 diff --git a/djangocms_admin_style/sass/libs/html5-boilerplate/_reset.scss b/djangocms_admin_style/sass/libs/html5-boilerplate/_reset.scss index 87d57d8f..78148bba 100644 --- a/djangocms_admin_style/sass/libs/html5-boilerplate/_reset.scss +++ b/djangocms_admin_style/sass/libs/html5-boilerplate/_reset.scss @@ -115,7 +115,7 @@ mark { color: $black; - font-weight: bold; + font-weight: bold; font-style: italic; background-color: #ff9; } diff --git a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.svg b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.svg index dd4faf05..0925d198 100644 --- a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.svg +++ b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.svg @@ -10,8 +10,8 @@ This is a custom SVG font generated by IcoMoon. - - - diff --git a/djangocms_admin_style/templates/admin/inc/branding.html b/djangocms_admin_style/templates/admin/inc/branding.html index 536d7ba2..4157b17a 100644 --- a/djangocms_admin_style/templates/admin/inc/branding.html +++ b/djangocms_admin_style/templates/admin/inc/branding.html @@ -25,7 +25,7 @@

{{ site_header|default:_('Django Administration') }}

{% endif %} {% if user.is_authenticated %}
  • -
    + {% csrf_token %}