diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bbf59cb..996a5ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,27 +2,27 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.1.0 + rev: v3.3.1 hooks: - id: pyupgrade - args: ['--keep-percent-format', '--py37-plus'] + args: ['--keep-percent-format', '--py39-plus'] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.10.0 + rev: 1.13.0 hooks: - id: django-upgrade - args: ['--target-version', '2.2'] + args: ['--target-version', '3.2'] - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 23.3.0 hooks: - id: black - args: ['--target-version', 'py37', '--skip-string-normalization', '--line-length', '110'] + args: ['--target-version', 'py39', '--skip-string-normalization', '--line-length', '110'] - repo: https://github.com/PyCQA/isort rev: 5.12.0 hooks: - id: isort args: ['--profile', 'black', '--line-length', '110'] - repo: https://github.com/rtts/djhtml - rev: 'v1.5.2' + rev: '3.0.6' hooks: - id: djhtml args: ['--tabwidth', '2'] diff --git a/README b/README index 9743811..e1e391d 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ djhtml is used to automatically indent html files, using those parameters: django-upgrade is used to automatically upgrade Django syntax, using those parameters: - django-upgrade --target-version 2.2 + django-upgrade --target-version 3.2 There is .pre-commit-config.yaml to use pre-commit to automatically run these tools before commits. (execute `pre-commit install` to install the git hook.) diff --git a/lingo/agendas/migrations/0001_initial.py b/lingo/agendas/migrations/0001_initial.py index 0083090..b07ab51 100644 --- a/lingo/agendas/migrations/0001_initial.py +++ b/lingo/agendas/migrations/0001_initial.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/lingo/agendas/migrations/0002_agenda.py b/lingo/agendas/migrations/0002_agenda.py index 05f17d7..baea33f 100644 --- a/lingo/agendas/migrations/0002_agenda.py +++ b/lingo/agendas/migrations/0002_agenda.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0001_initial'), ] diff --git a/lingo/agendas/migrations/0003_check_type_group.py b/lingo/agendas/migrations/0003_check_type_group.py index eda655b..ce3f254 100644 --- a/lingo/agendas/migrations/0003_check_type_group.py +++ b/lingo/agendas/migrations/0003_check_type_group.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0002_agenda'), ] diff --git a/lingo/agendas/migrations/0004_regie.py b/lingo/agendas/migrations/0004_regie.py index 0ad16cc..d54dabf 100644 --- a/lingo/agendas/migrations/0004_regie.py +++ b/lingo/agendas/migrations/0004_regie.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0001_initial'), ('agendas', '0003_check_type_group'), diff --git a/lingo/invoicing/migrations/0001_initial.py b/lingo/invoicing/migrations/0001_initial.py index edeb764..3a16cba 100644 --- a/lingo/invoicing/migrations/0001_initial.py +++ b/lingo/invoicing/migrations/0001_initial.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/lingo/invoicing/migrations/0002_invoice.py b/lingo/invoicing/migrations/0002_invoice.py index ec12bac..f895219 100644 --- a/lingo/invoicing/migrations/0002_invoice.py +++ b/lingo/invoicing/migrations/0002_invoice.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0001_initial'), ] diff --git a/lingo/invoicing/migrations/0003_invoice.py b/lingo/invoicing/migrations/0003_invoice.py index c992e28..22500b3 100644 --- a/lingo/invoicing/migrations/0003_invoice.py +++ b/lingo/invoicing/migrations/0003_invoice.py @@ -17,7 +17,6 @@ sql_forwards = sql_triggers class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0002_invoice'), ] diff --git a/lingo/invoicing/migrations/0004_campaign.py b/lingo/invoicing/migrations/0004_campaign.py index 46b2565..12913af 100644 --- a/lingo/invoicing/migrations/0004_campaign.py +++ b/lingo/invoicing/migrations/0004_campaign.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0003_invoice'), ] diff --git a/lingo/invoicing/migrations/0005_pool_status.py b/lingo/invoicing/migrations/0005_pool_status.py index 36badb0..29f0d06 100644 --- a/lingo/invoicing/migrations/0005_pool_status.py +++ b/lingo/invoicing/migrations/0005_pool_status.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0004_campaign'), ] diff --git a/lingo/invoicing/migrations/0006_pool_status.py b/lingo/invoicing/migrations/0006_pool_status.py index 658c0a0..0c1f1cf 100644 --- a/lingo/invoicing/migrations/0006_pool_status.py +++ b/lingo/invoicing/migrations/0006_pool_status.py @@ -9,7 +9,6 @@ def forward(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0005_pool_status'), ] diff --git a/lingo/invoicing/migrations/0007_pool_exception.py b/lingo/invoicing/migrations/0007_pool_exception.py index f8662ff..93e9dac 100644 --- a/lingo/invoicing/migrations/0007_pool_exception.py +++ b/lingo/invoicing/migrations/0007_pool_exception.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0006_pool_status'), ] diff --git a/lingo/invoicing/migrations/0008_injected_line.py b/lingo/invoicing/migrations/0008_injected_line.py index d12a2df..8c7f089 100644 --- a/lingo/invoicing/migrations/0008_injected_line.py +++ b/lingo/invoicing/migrations/0008_injected_line.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0007_pool_exception'), ] diff --git a/lingo/invoicing/migrations/0009_user_name.py b/lingo/invoicing/migrations/0009_user_name.py index 1a53209..3f9920c 100644 --- a/lingo/invoicing/migrations/0009_user_name.py +++ b/lingo/invoicing/migrations/0009_user_name.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0008_injected_line'), ] diff --git a/lingo/invoicing/migrations/0010_event_date.py b/lingo/invoicing/migrations/0010_event_date.py index 9c4efe6..f8b9f8f 100644 --- a/lingo/invoicing/migrations/0010_event_date.py +++ b/lingo/invoicing/migrations/0010_event_date.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0009_user_name'), ] diff --git a/lingo/invoicing/migrations/0011_counter.py b/lingo/invoicing/migrations/0011_counter.py index 3d5bd99..1588a09 100644 --- a/lingo/invoicing/migrations/0011_counter.py +++ b/lingo/invoicing/migrations/0011_counter.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0010_event_date'), ] diff --git a/lingo/invoicing/migrations/0012_counter.py b/lingo/invoicing/migrations/0012_counter.py index 4feaded..9ab3446 100644 --- a/lingo/invoicing/migrations/0012_counter.py +++ b/lingo/invoicing/migrations/0012_counter.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0011_counter'), ] diff --git a/lingo/invoicing/migrations/0013_formatted_number.py b/lingo/invoicing/migrations/0013_formatted_number.py index efed8f5..3f4af2f 100644 --- a/lingo/invoicing/migrations/0013_formatted_number.py +++ b/lingo/invoicing/migrations/0013_formatted_number.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0012_counter'), ] diff --git a/lingo/invoicing/migrations/0014_error_status.py b/lingo/invoicing/migrations/0014_error_status.py index ae2014a..9c672af 100644 --- a/lingo/invoicing/migrations/0014_error_status.py +++ b/lingo/invoicing/migrations/0014_error_status.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0013_formatted_number'), ] diff --git a/lingo/invoicing/migrations/0015_injected_lines.py b/lingo/invoicing/migrations/0015_injected_lines.py index cd1e42a..20fa01e 100644 --- a/lingo/invoicing/migrations/0015_injected_lines.py +++ b/lingo/invoicing/migrations/0015_injected_lines.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0014_error_status'), ] diff --git a/lingo/invoicing/migrations/0016_campaign_regie.py b/lingo/invoicing/migrations/0016_campaign_regie.py index 8a19723..c7b5613 100644 --- a/lingo/invoicing/migrations/0016_campaign_regie.py +++ b/lingo/invoicing/migrations/0016_campaign_regie.py @@ -18,7 +18,6 @@ def forward(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0015_injected_lines'), ] diff --git a/lingo/invoicing/migrations/0017_campaign_regie.py b/lingo/invoicing/migrations/0017_campaign_regie.py index 928fee5..abe6211 100644 --- a/lingo/invoicing/migrations/0017_campaign_regie.py +++ b/lingo/invoicing/migrations/0017_campaign_regie.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0016_campaign_regie'), ] diff --git a/lingo/invoicing/migrations/0018_payer.py b/lingo/invoicing/migrations/0018_payer.py index 279a7cc..296cd56 100644 --- a/lingo/invoicing/migrations/0018_payer.py +++ b/lingo/invoicing/migrations/0018_payer.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0017_campaign_regie'), ] diff --git a/lingo/invoicing/migrations/0019_payer.py b/lingo/invoicing/migrations/0019_payer.py index a3ebc63..660ce6b 100644 --- a/lingo/invoicing/migrations/0019_payer.py +++ b/lingo/invoicing/migrations/0019_payer.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('invoicing', '0018_payer'), ] diff --git a/lingo/pricing/migrations/0001_initial.py b/lingo/pricing/migrations/0001_initial.py index 729616f..cf311d1 100644 --- a/lingo/pricing/migrations/0001_initial.py +++ b/lingo/pricing/migrations/0001_initial.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/lingo/pricing/migrations/0002_pricing.py b/lingo/pricing/migrations/0002_pricing.py index 60d0b3e..29c1ea0 100644 --- a/lingo/pricing/migrations/0002_pricing.py +++ b/lingo/pricing/migrations/0002_pricing.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/lingo/pricing/migrations/0003_extra_variables.py b/lingo/pricing/migrations/0003_extra_variables.py index d2295a4..a3234e9 100644 --- a/lingo/pricing/migrations/0003_extra_variables.py +++ b/lingo/pricing/migrations/0003_extra_variables.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('pricing', '0002_pricing'), ] diff --git a/lingo/pricing/migrations/0004_criteria_default.py b/lingo/pricing/migrations/0004_criteria_default.py index cbc4bf1..fdbeeaa 100644 --- a/lingo/pricing/migrations/0004_criteria_default.py +++ b/lingo/pricing/migrations/0004_criteria_default.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('pricing', '0003_extra_variables'), ] diff --git a/lingo/pricing/migrations/0005_agenda_pricing_m2m.py b/lingo/pricing/migrations/0005_agenda_pricing_m2m.py index 0db877e..1faa8b0 100644 --- a/lingo/pricing/migrations/0005_agenda_pricing_m2m.py +++ b/lingo/pricing/migrations/0005_agenda_pricing_m2m.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0003_check_type_group'), ('pricing', '0004_criteria_default'), diff --git a/lingo/pricing/migrations/0006_agenda_pricing_m2m.py b/lingo/pricing/migrations/0006_agenda_pricing_m2m.py index 85e5113..e45d7d8 100644 --- a/lingo/pricing/migrations/0006_agenda_pricing_m2m.py +++ b/lingo/pricing/migrations/0006_agenda_pricing_m2m.py @@ -27,7 +27,6 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('pricing', '0005_agenda_pricing_m2m'), ] diff --git a/lingo/pricing/migrations/0007_agenda_pricing_slug_and_label.py b/lingo/pricing/migrations/0007_agenda_pricing_slug_and_label.py index 5466d2a..ba34593 100644 --- a/lingo/pricing/migrations/0007_agenda_pricing_slug_and_label.py +++ b/lingo/pricing/migrations/0007_agenda_pricing_slug_and_label.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('pricing', '0006_agenda_pricing_m2m'), ] diff --git a/lingo/pricing/migrations/0008_agenda_pricing_slug_and_label.py b/lingo/pricing/migrations/0008_agenda_pricing_slug_and_label.py index bf4f3bd..04f3219 100644 --- a/lingo/pricing/migrations/0008_agenda_pricing_slug_and_label.py +++ b/lingo/pricing/migrations/0008_agenda_pricing_slug_and_label.py @@ -14,7 +14,6 @@ def forwards(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('pricing', '0007_agenda_pricing_slug_and_label'), ] diff --git a/lingo/pricing/migrations/0009_agenda_pricing_m2m.py b/lingo/pricing/migrations/0009_agenda_pricing_m2m.py index a742bc1..d51c391 100644 --- a/lingo/pricing/migrations/0009_agenda_pricing_m2m.py +++ b/lingo/pricing/migrations/0009_agenda_pricing_m2m.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('pricing', '0008_agenda_pricing_slug_and_label'), ] diff --git a/lingo/pricing/migrations/0010_flat_fee_schedule.py b/lingo/pricing/migrations/0010_flat_fee_schedule.py index 043c06e..d6d9829 100644 --- a/lingo/pricing/migrations/0010_flat_fee_schedule.py +++ b/lingo/pricing/migrations/0010_flat_fee_schedule.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('pricing', '0009_agenda_pricing_m2m'), ] diff --git a/lingo/pricing/migrations/0011_payer_variables.py b/lingo/pricing/migrations/0011_payer_variables.py index 6aa841d..3e9510e 100644 --- a/lingo/pricing/migrations/0011_payer_variables.py +++ b/lingo/pricing/migrations/0011_payer_variables.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('pricing', '0010_flat_fee_schedule'), ] diff --git a/lingo/pricing/models.py b/lingo/pricing/models.py index d61f981..f818e72 100644 --- a/lingo/pricing/models.py +++ b/lingo/pricing/models.py @@ -18,7 +18,6 @@ import copy import dataclasses import datetime import decimal -from typing import List from django.db import models from django.template import Context, RequestContext, Template, TemplateSyntaxError, VariableDoesNotExist @@ -398,13 +397,13 @@ class PricingMatrixCell: @dataclasses.dataclass class PricingMatrixRow: criteria: Criteria - cells: List[PricingMatrixCell] + cells: list[PricingMatrixCell] @dataclasses.dataclass class PricingMatrix: criteria: Criteria - rows: List[PricingMatrixRow] + rows: list[PricingMatrixRow] class AgendaPricing(models.Model): diff --git a/lingo/settings.py b/lingo/settings.py index f7ea03c..b4bf3fa 100644 --- a/lingo/settings.py +++ b/lingo/settings.py @@ -113,7 +113,7 @@ WSGI_APPLICATION = 'lingo.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', } } diff --git a/lingo/urls.py b/lingo/urls.py index ded967d..d10301c 100644 --- a/lingo/urls.py +++ b/lingo/urls.py @@ -31,15 +31,15 @@ urlpatterns = [ re_path(r'^manage/', decorated_includes(manager_required, include(lingo_manager_urls))), re_path(r'^manage/invoicing/', decorated_includes(manager_required, include(lingo_invoicing_urls))), re_path(r'^manage/pricing/', decorated_includes(manager_required, include(lingo_pricing_urls))), - re_path(r'^api/', include(lingo_api_urls)), + path('api/', include(lingo_api_urls)), path('login/', login, name='auth_login'), path('logout/', logout, name='auth_logout'), ] if 'mellon' in settings.INSTALLED_APPS: urlpatterns.append( - re_path( - r'^accounts/mellon/', + path( + 'accounts/mellon/', include('mellon.urls'), kwargs={ 'template_base': 'lingo/mellon_base_template.html', @@ -55,5 +55,5 @@ if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar # pylint: disable=import-error urlpatterns = [ - re_path(r'^__debug__/', include(debug_toolbar.urls)), + path('__debug__/', include(debug_toolbar.urls)), ] + urlpatterns diff --git a/setup.py b/setup.py index 99d94f1..2320330 100644 --- a/setup.py +++ b/setup.py @@ -160,7 +160,7 @@ setup( 'Programming Language :: Python :: 3', ], install_requires=[ - 'django>=2.2, <3.3', + 'django>=3.2, <3.3', 'gadjo>=0.53', 'requests', 'eopayment>=1.60', diff --git a/tests/settings.py b/tests/settings.py index 8081ed0..6eeda1e 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -17,7 +17,7 @@ CACHES = { DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'TEST': { 'NAME': ('lingo-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-'))[:63], },