From ab5328e3bf389fb973325f0b825128b374747521 Mon Sep 17 00:00:00 2001 From: glbert Date: Fri, 17 Nov 2023 14:35:11 +0100 Subject: [PATCH 01/29] fix deprecation warnings --- heltour/settings_default.py | 8 +- heltour/tournament/admin.py | 2 +- heltour/tournament/models.py | 4 +- heltour/tournament/templates/base.html | 2 +- heltour/tournament/templates/empty_base.html | 2 +- .../tournament/admin/bulk_email.html | 2 +- .../tournament/admin/edit_rosters.html | 2 +- .../admin/edit_rosters_player_info.html | 2 +- .../tournament/admin/manage_lone_players.html | 2 +- .../tournament/admin/pre_round_report.html | 2 +- .../admin/review_lone_pairings.html | 2 +- .../tournament/admin/review_modrequest.html | 2 +- .../tournament/admin/review_registration.html | 2 +- .../admin/review_team_pairings.html | 2 +- .../templates/tournament/admin/team_spam.html | 2 +- .../templates/tournament/availability.html | 2 +- .../templates/tournament/document.html | 2 +- .../templates/tournament/document_inline.html | 2 +- .../tournament/templates/tournament/home.html | 2 +- .../templates/tournament/login.html | 2 +- .../templates/tournament/logout.html | 2 +- .../lone_completed_season_landing.html | 2 +- .../tournament/lone_league_dashboard.html | 2 +- .../tournament/lone_league_home.html | 2 +- .../templates/tournament/lone_pairings.html | 2 +- .../tournament/lone_season_landing.html | 2 +- .../templates/tournament/lone_standings.html | 2 +- .../templates/tournament/lone_wallchart.html | 2 +- .../templates/tournament/modrequest.html | 2 +- .../templates/tournament/nominate.html | 2 +- .../templates/tournament/register.html | 2 +- .../templates/tournament/season_switcher.html | 2 +- .../tournament/section_switcher.html | 2 +- .../team_completed_season_landing.html | 2 +- .../templates/tournament/team_crosstable.html | 2 +- .../tournament/team_league_dashboard.html | 2 +- .../tournament/team_league_home.html | 2 +- .../templates/tournament/team_pairings.html | 2 +- .../templates/tournament/team_rosters.html | 2 +- .../tournament/team_season_landing.html | 2 +- .../templates/tournament/team_standings.html | 2 +- .../tournament/templates/tournament/tv.html | 2 +- .../templates/tournament/user_dashboard.html | 2 +- heltour/tournament/tests/test_models.py | 4 +- poetry.lock | 1363 +++++++++-------- pyproject.toml | 27 +- 46 files changed, 770 insertions(+), 718 deletions(-) diff --git a/heltour/settings_default.py b/heltour/settings_default.py index bbd4dc78..ec160915 100644 --- a/heltour/settings_default.py +++ b/heltour/settings_default.py @@ -249,10 +249,16 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_PRECOMPILER_OUTPUT_DIR = '../heltour/tournament/static/' STATIC_PRECOMPILER_COMPILERS = ( - ('static_precompiler.compilers.SCSS', { + ('static_precompiler.compilers.dart_sass.SCSS', { 'sourcemap_enabled': True, + 'load_paths': ['/path'], 'output_style': 'compact' }), + ('static_precompiler.compilers.dart_sass.SASS', { + 'sourcemap_enabled': True, + 'load_paths': ['/path'], + 'output_style': 'compressed', + }), ) STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' diff --git a/heltour/tournament/admin.py b/heltour/tournament/admin.py index a9190c0e..f2fa8bfa 100644 --- a/heltour/tournament/admin.py +++ b/heltour/tournament/admin.py @@ -29,7 +29,7 @@ from django.core.exceptions import PermissionDenied from django.contrib.admin.filters import FieldListFilter, RelatedFieldListFilter, \ SimpleListFilter -from django.contrib.staticfiles.templatetags.staticfiles import static +from django.templatetags.static import static from django.db.models.signals import post_save from django.dispatch.dispatcher import receiver from django.contrib.contenttypes.models import ContentType diff --git a/heltour/tournament/models.py b/heltour/tournament/models.py index fb6c3bf4..a9d82cc2 100644 --- a/heltour/tournament/models.py +++ b/heltour/tournament/models.py @@ -66,7 +66,7 @@ def format_score(score, game_played=None): # Represents a positive number in increments of 0.5 (0, 0.5, 1, etc.) class ScoreField(models.PositiveIntegerField): - def from_db_value(self, value, expression, connection, context): + def from_db_value(self, value, expression, connection): if value is None: return None return value / 2.0 @@ -732,7 +732,7 @@ def __str__(self): return self.account_username -username_validator = RegexValidator('^[\w-]+$') +username_validator = RegexValidator('^[\\w-]+$') ACCOUNT_STATUS_OPTIONS = ( ('normal', 'Normal'), diff --git a/heltour/tournament/templates/base.html b/heltour/tournament/templates/base.html index 71d96d67..c60961b1 100644 --- a/heltour/tournament/templates/base.html +++ b/heltour/tournament/templates/base.html @@ -1,5 +1,5 @@ {% extends "empty_base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block iconpath %}{% spaceless %} {% if league.theme == 'blue' %} diff --git a/heltour/tournament/templates/empty_base.html b/heltour/tournament/templates/empty_base.html index 8e7f0eb4..cec0fabd 100644 --- a/heltour/tournament/templates/empty_base.html +++ b/heltour/tournament/templates/empty_base.html @@ -1,4 +1,4 @@ -{% load staticfiles compile_static tournament_extras %} +{% load static compile_static tournament_extras %} diff --git a/heltour/tournament/templates/tournament/admin/bulk_email.html b/heltour/tournament/templates/tournament/admin/bulk_email.html index 23fd2b48..a3d786c9 100644 --- a/heltour/tournament/templates/tournament/admin/bulk_email.html +++ b/heltour/tournament/templates/tournament/admin/bulk_email.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles %} +{% load static %} {% block extrahead %}{{ block.super }} diff --git a/heltour/tournament/templates/tournament/admin/edit_rosters.html b/heltour/tournament/templates/tournament/admin/edit_rosters.html index 6f5a81cd..95313a05 100644 --- a/heltour/tournament/templates/tournament/admin/edit_rosters.html +++ b/heltour/tournament/templates/tournament/admin/edit_rosters.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block extrahead %}{{ block.super }} diff --git a/heltour/tournament/templates/tournament/admin/edit_rosters_player_info.html b/heltour/tournament/templates/tournament/admin/edit_rosters_player_info.html index 87e7ec97..188877dc 100644 --- a/heltour/tournament/templates/tournament/admin/edit_rosters_player_info.html +++ b/heltour/tournament/templates/tournament/admin/edit_rosters_player_info.html @@ -1,4 +1,4 @@ -{% load staticfiles tournament_extras comments %} +{% load static tournament_extras comments %} diff --git a/heltour/tournament/templates/tournament/admin/manage_lone_players.html b/heltour/tournament/templates/tournament/admin/manage_lone_players.html index 32be980b..62b2c528 100644 --- a/heltour/tournament/templates/tournament/admin/manage_lone_players.html +++ b/heltour/tournament/templates/tournament/admin/manage_lone_players.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block extrahead %}{{ block.super }} diff --git a/heltour/tournament/templates/tournament/admin/pre_round_report.html b/heltour/tournament/templates/tournament/admin/pre_round_report.html index 6f925919..8a14067a 100644 --- a/heltour/tournament/templates/tournament/admin/pre_round_report.html +++ b/heltour/tournament/templates/tournament/admin/pre_round_report.html @@ -1,6 +1,6 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} {% load comments %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block extrahead %}{{ block.super }} diff --git a/heltour/tournament/templates/tournament/admin/review_lone_pairings.html b/heltour/tournament/templates/tournament/admin/review_lone_pairings.html index 9c8f431f..84ba948a 100644 --- a/heltour/tournament/templates/tournament/admin/review_lone_pairings.html +++ b/heltour/tournament/templates/tournament/admin/review_lone_pairings.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block extrahead %}{{ block.super }} diff --git a/heltour/tournament/templates/tournament/admin/review_modrequest.html b/heltour/tournament/templates/tournament/admin/review_modrequest.html index 06b8eebd..a0bb48c8 100644 --- a/heltour/tournament/templates/tournament/admin/review_modrequest.html +++ b/heltour/tournament/templates/tournament/admin/review_modrequest.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras comments %} +{% load static tournament_extras comments %} {% block content %} diff --git a/heltour/tournament/templates/tournament/admin/review_registration.html b/heltour/tournament/templates/tournament/admin/review_registration.html index 49cbff2e..4bd0aa10 100644 --- a/heltour/tournament/templates/tournament/admin/review_registration.html +++ b/heltour/tournament/templates/tournament/admin/review_registration.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras comments %} +{% load static tournament_extras comments %} {% block content %} diff --git a/heltour/tournament/templates/tournament/admin/review_team_pairings.html b/heltour/tournament/templates/tournament/admin/review_team_pairings.html index 8b35d40b..7f32b13b 100644 --- a/heltour/tournament/templates/tournament/admin/review_team_pairings.html +++ b/heltour/tournament/templates/tournament/admin/review_team_pairings.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block content %} diff --git a/heltour/tournament/templates/tournament/admin/team_spam.html b/heltour/tournament/templates/tournament/admin/team_spam.html index 80f2a059..15c8c6ba 100644 --- a/heltour/tournament/templates/tournament/admin/team_spam.html +++ b/heltour/tournament/templates/tournament/admin/team_spam.html @@ -1,5 +1,5 @@ {% extends "tournament/admin/custom_edit_workflow.html" %} -{% load staticfiles %} +{% load static %} {% block content %} diff --git a/heltour/tournament/templates/tournament/availability.html b/heltour/tournament/templates/tournament/availability.html index 748e969e..ea8d4930 100644 --- a/heltour/tournament/templates/tournament/availability.html +++ b/heltour/tournament/templates/tournament/availability.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}Availability - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/document.html b/heltour/tournament/templates/tournament/document.html index 3cdeb85f..22f5f3b4 100644 --- a/heltour/tournament/templates/tournament/document.html +++ b/heltour/tournament/templates/tournament/document.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% block title %}{{ document.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/document_inline.html b/heltour/tournament/templates/tournament/document_inline.html index b622d076..8fb13e2c 100644 --- a/heltour/tournament/templates/tournament/document_inline.html +++ b/heltour/tournament/templates/tournament/document_inline.html @@ -1,4 +1,4 @@ -{% load staticfiles tournament_extras %} +{% load static tournament_extras %}
diff --git a/heltour/tournament/templates/tournament/home.html b/heltour/tournament/templates/tournament/home.html index 43ba3623..cddc5399 100644 --- a/heltour/tournament/templates/tournament/home.html +++ b/heltour/tournament/templates/tournament/home.html @@ -1,5 +1,5 @@ {% extends "empty_base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}Lichess Leagues{% endblock %} diff --git a/heltour/tournament/templates/tournament/login.html b/heltour/tournament/templates/tournament/login.html index eb340f70..bdfe1bc3 100644 --- a/heltour/tournament/templates/tournament/login.html +++ b/heltour/tournament/templates/tournament/login.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}Login - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/logout.html b/heltour/tournament/templates/tournament/logout.html index c884a546..b478db85 100644 --- a/heltour/tournament/templates/tournament/logout.html +++ b/heltour/tournament/templates/tournament/logout.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}Login - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_completed_season_landing.html b/heltour/tournament/templates/tournament/lone_completed_season_landing.html index 27491c93..ece6aa7d 100644 --- a/heltour/tournament/templates/tournament/lone_completed_season_landing.html +++ b/heltour/tournament/templates/tournament/lone_completed_season_landing.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}{{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_league_dashboard.html b/heltour/tournament/templates/tournament/lone_league_dashboard.html index e202ae8c..4dc6ee15 100644 --- a/heltour/tournament/templates/tournament/lone_league_dashboard.html +++ b/heltour/tournament/templates/tournament/lone_league_dashboard.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}Dashboard - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_league_home.html b/heltour/tournament/templates/tournament/lone_league_home.html index dc0410e8..a8e9c0e6 100644 --- a/heltour/tournament/templates/tournament/lone_league_home.html +++ b/heltour/tournament/templates/tournament/lone_league_home.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}{{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_pairings.html b/heltour/tournament/templates/tournament/lone_pairings.html index 6b09948e..51514c0a 100644 --- a/heltour/tournament/templates/tournament/lone_pairings.html +++ b/heltour/tournament/templates/tournament/lone_pairings.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}Pairings - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_season_landing.html b/heltour/tournament/templates/tournament/lone_season_landing.html index bc3ee2b2..3d5bd8a7 100644 --- a/heltour/tournament/templates/tournament/lone_season_landing.html +++ b/heltour/tournament/templates/tournament/lone_season_landing.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}{{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_standings.html b/heltour/tournament/templates/tournament/lone_standings.html index 056b4573..0ecbadf1 100644 --- a/heltour/tournament/templates/tournament/lone_standings.html +++ b/heltour/tournament/templates/tournament/lone_standings.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}Standings - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/lone_wallchart.html b/heltour/tournament/templates/tournament/lone_wallchart.html index 799925cb..272ff026 100644 --- a/heltour/tournament/templates/tournament/lone_wallchart.html +++ b/heltour/tournament/templates/tournament/lone_wallchart.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles tournament_extras %} +{% load static tournament_extras %} {% block title %}Wallchart - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/modrequest.html b/heltour/tournament/templates/tournament/modrequest.html index ebf2e99f..3c303a20 100644 --- a/heltour/tournament/templates/tournament/modrequest.html +++ b/heltour/tournament/templates/tournament/modrequest.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}{{ req_type }} - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/nominate.html b/heltour/tournament/templates/tournament/nominate.html index 717c2308..14c258c0 100644 --- a/heltour/tournament/templates/tournament/nominate.html +++ b/heltour/tournament/templates/tournament/nominate.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}Game Nomination - {{ season.name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/register.html b/heltour/tournament/templates/tournament/register.html index 45e2e53d..d912f7f5 100644 --- a/heltour/tournament/templates/tournament/register.html +++ b/heltour/tournament/templates/tournament/register.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 tournament_extras staticfiles %} +{% load bootstrap3 tournament_extras static %} {% block title %}Registration - {{ registration_season.section_group_name }} - {{ league.name }}{% endblock %} diff --git a/heltour/tournament/templates/tournament/season_switcher.html b/heltour/tournament/templates/tournament/season_switcher.html index cbf00637..96839b7b 100644 --- a/heltour/tournament/templates/tournament/season_switcher.html +++ b/heltour/tournament/templates/tournament/season_switcher.html @@ -1,4 +1,4 @@ -{% load staticfiles tournament_extras %} +{% load static tournament_extras %}