.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']

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.)

lingo/agendas/migrations/0001_initial.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

lingo/agendas/migrations/0002_agenda.py

@@ -2,7 +2,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('agendas', '0001_initial'),
     ]

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'),
     ]

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'),

lingo/invoicing/migrations/0001_initial.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

lingo/invoicing/migrations/0002_invoice.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('invoicing', '0001_initial'),
     ]

lingo/invoicing/migrations/0003_invoice.py

@@ -17,7 +17,6 @@ sql_forwards = sql_triggers
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('invoicing', '0002_invoice'),
     ]

lingo/invoicing/migrations/0004_campaign.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('invoicing', '0003_invoice'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

lingo/invoicing/migrations/0012_counter.py

@@ -2,7 +2,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('invoicing', '0011_counter'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

lingo/invoicing/migrations/0019_payer.py

@@ -2,7 +2,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('invoicing', '0018_payer'),
     ]

lingo/pricing/migrations/0001_initial.py

@@ -2,7 +2,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

lingo/pricing/migrations/0002_pricing.py

@@ -3,7 +3,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

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'),
     ]

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'),
     ]

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'),

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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'),
     ]

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):

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',
     }
 }
 

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(
+        path(
-            r'^accounts/mellon/',
+            '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

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',

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],
         },