From b8a8c1595f4efb804e578b40096e2ae5db9f9083 Mon Sep 17 00:00:00 2001 From: Fabio Caccamo Date: Sat, 31 Dec 2022 18:53:01 +0100 Subject: [PATCH] Add `pyupgrade` to `pre-commit` config. --- .pre-commit-config.yaml | 5 +++++ admin_interface/migrations/0001_initial.py | 2 -- admin_interface/migrations/0002_add_related_modal.py | 2 -- admin_interface/migrations/0003_add_logo_color.py | 2 -- admin_interface/migrations/0004_rename_title_color.py | 2 -- .../migrations/0005_add_recent_actions_visible.py | 2 -- admin_interface/migrations/0006_bytes_to_str.py | 2 -- admin_interface/migrations/0007_add_favicon.py | 2 -- .../0008_change_related_modal_background_opacity_type.py | 2 -- admin_interface/migrations/0009_add_enviroment.py | 2 -- admin_interface/migrations/0010_add_localization.py | 2 -- admin_interface/migrations/0011_add_environment_options.py | 2 -- admin_interface/migrations/0012_update_verbose_names.py | 2 -- .../migrations/0013_add_related_modal_close_button.py | 2 -- admin_interface/migrations/0014_name_unique.py | 2 -- .../migrations/0015_add_language_chooser_active.py | 2 -- .../migrations/0016_add_language_chooser_display.py | 2 -- .../migrations/0017_change_list_filter_dropdown.py | 2 -- admin_interface/migrations/0018_theme_list_filter_sticky.py | 2 -- admin_interface/migrations/0019_add_form_sticky.py | 2 -- admin_interface/migrations/0020_module_selected_colors.py | 2 -- admin_interface/migrations/0021_file_extension_validator.py | 2 -- .../migrations/0022_add_logo_max_width_and_height.py | 2 -- admin_interface/migrations/0023_theme_foldable_apps.py | 2 -- admin_interface/migrations/0024_remove_theme_css.py | 2 -- tests/routers.py | 2 +- tests/test_fixtures.py | 2 +- 27 files changed, 7 insertions(+), 50 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b3fb8cc..b931861 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,11 @@ # See https://pre-commit.com/hooks.html for more hooks repos: + - repo: https://github.com/asottile/pyupgrade + rev: v3.3.1 + hooks: + - id: pyupgrade + - repo: https://github.com/psf/black rev: 22.12.0 hooks: diff --git a/admin_interface/migrations/0001_initial.py b/admin_interface/migrations/0001_initial.py index c3cd74c..b18ec0a 100644 --- a/admin_interface/migrations/0001_initial.py +++ b/admin_interface/migrations/0001_initial.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations, models diff --git a/admin_interface/migrations/0002_add_related_modal.py b/admin_interface/migrations/0002_add_related_modal.py index cde7d3c..94adfb1 100644 --- a/admin_interface/migrations/0002_add_related_modal.py +++ b/admin_interface/migrations/0002_add_related_modal.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations, models diff --git a/admin_interface/migrations/0003_add_logo_color.py b/admin_interface/migrations/0003_add_logo_color.py index a2e9748..b140e5e 100644 --- a/admin_interface/migrations/0003_add_logo_color.py +++ b/admin_interface/migrations/0003_add_logo_color.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations, models diff --git a/admin_interface/migrations/0004_rename_title_color.py b/admin_interface/migrations/0004_rename_title_color.py index 400fe89..d93cd16 100644 --- a/admin_interface/migrations/0004_rename_title_color.py +++ b/admin_interface/migrations/0004_rename_title_color.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations diff --git a/admin_interface/migrations/0005_add_recent_actions_visible.py b/admin_interface/migrations/0005_add_recent_actions_visible.py index 6372f88..e94e8dd 100644 --- a/admin_interface/migrations/0005_add_recent_actions_visible.py +++ b/admin_interface/migrations/0005_add_recent_actions_visible.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0006_bytes_to_str.py b/admin_interface/migrations/0006_bytes_to_str.py index 3bb3851..04f119f 100644 --- a/admin_interface/migrations/0006_bytes_to_str.py +++ b/admin_interface/migrations/0006_bytes_to_str.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations, models diff --git a/admin_interface/migrations/0007_add_favicon.py b/admin_interface/migrations/0007_add_favicon.py index 24496e6..52230e3 100644 --- a/admin_interface/migrations/0007_add_favicon.py +++ b/admin_interface/migrations/0007_add_favicon.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0008_change_related_modal_background_opacity_type.py b/admin_interface/migrations/0008_change_related_modal_background_opacity_type.py index dee40a5..2950b78 100644 --- a/admin_interface/migrations/0008_change_related_modal_background_opacity_type.py +++ b/admin_interface/migrations/0008_change_related_modal_background_opacity_type.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0009_add_enviroment.py b/admin_interface/migrations/0009_add_enviroment.py index 1c9c8ee..ee08527 100644 --- a/admin_interface/migrations/0009_add_enviroment.py +++ b/admin_interface/migrations/0009_add_enviroment.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0010_add_localization.py b/admin_interface/migrations/0010_add_localization.py index 542d4b5..7664511 100644 --- a/admin_interface/migrations/0010_add_localization.py +++ b/admin_interface/migrations/0010_add_localization.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0011_add_environment_options.py b/admin_interface/migrations/0011_add_environment_options.py index d2e4cc3..70f3472 100644 --- a/admin_interface/migrations/0011_add_environment_options.py +++ b/admin_interface/migrations/0011_add_environment_options.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations, models diff --git a/admin_interface/migrations/0012_update_verbose_names.py b/admin_interface/migrations/0012_update_verbose_names.py index 7db832a..2b8af66 100644 --- a/admin_interface/migrations/0012_update_verbose_names.py +++ b/admin_interface/migrations/0012_update_verbose_names.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations diff --git a/admin_interface/migrations/0013_add_related_modal_close_button.py b/admin_interface/migrations/0013_add_related_modal_close_button.py index 1e5c7f7..1be545c 100644 --- a/admin_interface/migrations/0013_add_related_modal_close_button.py +++ b/admin_interface/migrations/0013_add_related_modal_close_button.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0014_name_unique.py b/admin_interface/migrations/0014_name_unique.py index 86c7618..3c09ccc 100644 --- a/admin_interface/migrations/0014_name_unique.py +++ b/admin_interface/migrations/0014_name_unique.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0015_add_language_chooser_active.py b/admin_interface/migrations/0015_add_language_chooser_active.py index c1d84b0..414f441 100644 --- a/admin_interface/migrations/0015_add_language_chooser_active.py +++ b/admin_interface/migrations/0015_add_language_chooser_active.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0016_add_language_chooser_display.py b/admin_interface/migrations/0016_add_language_chooser_display.py index a847fde..797cd3d 100644 --- a/admin_interface/migrations/0016_add_language_chooser_display.py +++ b/admin_interface/migrations/0016_add_language_chooser_display.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0017_change_list_filter_dropdown.py b/admin_interface/migrations/0017_change_list_filter_dropdown.py index 7b40e75..0030e25 100644 --- a/admin_interface/migrations/0017_change_list_filter_dropdown.py +++ b/admin_interface/migrations/0017_change_list_filter_dropdown.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0018_theme_list_filter_sticky.py b/admin_interface/migrations/0018_theme_list_filter_sticky.py index 6727473..8219261 100644 --- a/admin_interface/migrations/0018_theme_list_filter_sticky.py +++ b/admin_interface/migrations/0018_theme_list_filter_sticky.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0019_add_form_sticky.py b/admin_interface/migrations/0019_add_form_sticky.py index ba4d8e5..90cc143 100644 --- a/admin_interface/migrations/0019_add_form_sticky.py +++ b/admin_interface/migrations/0019_add_form_sticky.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0020_module_selected_colors.py b/admin_interface/migrations/0020_module_selected_colors.py index 170257c..631fcd1 100644 --- a/admin_interface/migrations/0020_module_selected_colors.py +++ b/admin_interface/migrations/0020_module_selected_colors.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import colorfield.fields from django.db import migrations from django.db.models import F diff --git a/admin_interface/migrations/0021_file_extension_validator.py b/admin_interface/migrations/0021_file_extension_validator.py index 9a9bab1..8cc657b 100644 --- a/admin_interface/migrations/0021_file_extension_validator.py +++ b/admin_interface/migrations/0021_file_extension_validator.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.validators import FileExtensionValidator from django.db import migrations, models diff --git a/admin_interface/migrations/0022_add_logo_max_width_and_height.py b/admin_interface/migrations/0022_add_logo_max_width_and_height.py index f81323c..8d6b365 100644 --- a/admin_interface/migrations/0022_add_logo_max_width_and_height.py +++ b/admin_interface/migrations/0022_add_logo_max_width_and_height.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0023_theme_foldable_apps.py b/admin_interface/migrations/0023_theme_foldable_apps.py index be0e583..9ac21a9 100644 --- a/admin_interface/migrations/0023_theme_foldable_apps.py +++ b/admin_interface/migrations/0023_theme_foldable_apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/admin_interface/migrations/0024_remove_theme_css.py b/admin_interface/migrations/0024_remove_theme_css.py index 5111871..e4ecc5f 100644 --- a/admin_interface/migrations/0024_remove_theme_css.py +++ b/admin_interface/migrations/0024_remove_theme_css.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/routers.py b/tests/routers.py index 682a8b6..988acfd 100644 --- a/tests/routers.py +++ b/tests/routers.py @@ -3,7 +3,7 @@ DATABASE_APPS_MAPPING = { } -class DatabaseAppsRouter(object): +class DatabaseAppsRouter: """ arouter to control all database operations on models for different databases. diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py index 7b2cc2c..4a28277 100644 --- a/tests/test_fixtures.py +++ b/tests/test_fixtures.py @@ -12,7 +12,7 @@ class AdminInterfaceFixturesTestCase(TestCase): pass def __load_theme(self, theme_name): - call_command("loaddata", "admin_interface_theme_%s.json" % (theme_name,)) + call_command("loaddata", "admin_interface_theme_{}.json".format(theme_name)) def test_import_initial_data(self): call_command("loaddata", "initial_data.json")