toulouse-maelis: update family WSDL (#75810)

This reverts commit 5b043a4030.

.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

@@ -76,7 +76,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.)

debian/control

@@ -19,7 +19,7 @@ Depends: ghostscript,
          python3-cmislib,
          python3-dateutil,
          python3-distutils,
-         python3-django (>= 2:2.2),
+         python3-django (>= 2:3.2),
          python3-django-model-utils,
          python3-feedparser,
          python3-gadjo,

passerelle/apps/actesweb/migrations/0001_initial.py

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

passerelle/apps/actesweb/migrations/0002_remove_actesweb_log_level.py

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

passerelle/apps/airquality/migrations/0001_initial.py

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

passerelle/apps/airquality/migrations/0002_auto_20170920_0951.py

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

passerelle/apps/airquality/migrations/0003_remove_airquality_log_level.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('airquality', '0002_auto_20170920_0951'),
     ]

passerelle/apps/airquality/migrations/0004_airquality_atmo_aura_api_token.py

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

passerelle/apps/api_entreprise/migrations/0001_initial.py

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

passerelle/apps/api_entreprise/migrations/0002_auto_20190701_1357.py

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

passerelle/apps/api_entreprise/migrations/0003_remove_version.py

@@ -14,7 +14,6 @@ def remove_url_path(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api_entreprise', '0002_auto_20190701_1357'),
     ]

passerelle/apps/api_entreprise/models.py

@@ -432,64 +432,7 @@ class APIEntreprise(BaseResource):
         },
     )
     def exercices(self, request, siret, **kwargs):
-        return self.get('v2/exercices/%s/' % siret, **kwargs)
-
-    @endpoint(
-        perm='can_access',
-        pattern=r'(?P<siren>\w+)/$',
-        example_pattern='{siren}/',
-        description=_('Get firm\'s annual workforce data'),
-        parameters={
-            'siren': SIREN_PARAM,
-            'object': OBJECT_PARAM,
-            'context': CONTEXT_PARAM,
-            'recipient': RECIPIENT_PARAM,
-        },
-    )
-    def effectifs_annuels_acoss_covid(self, request, siren, **kwargs):
-        if len(siren) != 9:
-            raise APIError(_('invalid SIREN length (must be 9 characters)'))
-        return self.get('v2/effectifs_annuels_acoss_covid/%s/' % siren, **kwargs)
-
-    @endpoint(
-        perm='can_access',
-        pattern=r'(?P<year>\w+)/(?P<month>\w+)/(?P<siren>\w+)/$',
-        description=_('Get firm\'s monthly workforce data, by SIREN'),
-        parameters={
-            'year': YEAR_PARAM,
-            'month': MONTH_PARAM,
-            'siren': SIREN_PARAM,
-            'object': OBJECT_PARAM,
-            'context': CONTEXT_PARAM,
-            'recipient': RECIPIENT_PARAM,
-        },
-    )
-    def entreprise_effectifs_mensuels_acoss_covid(self, request, year, month, siren, **kwargs):
-        if len(siren) != 9:
-            raise APIError(_('invalid SIREN length (must be 9 characters)'))
-        month = month.zfill(2)
-        return self.get(
-            'v2/effectifs_mensuels_acoss_covid/%s/%s/entreprise/%s/' % (year, month, siren), **kwargs
-        )
-
-    @endpoint(
-        perm='can_access',
-        pattern=r'(?P<year>\w+)/(?P<month>\w+)/(?P<siret>\w+)/$',
-        description=_('Get firm\'s monthly workforce data, by SIRET'),
-        parameters={
-            'year': YEAR_PARAM,
-            'month': MONTH_PARAM,
-            'siret': SIRET_PARAM,
-            'object': OBJECT_PARAM,
-            'context': CONTEXT_PARAM,
-            'recipient': RECIPIENT_PARAM,
-        },
-    )
-    def etablissement_effectifs_mensuels_acoss_covid(self, request, year, month, siret, **kwargs):
-        month = month.zfill(2)
-        return self.get(
-            'v2/effectifs_mensuels_acoss_covid/%s/%s/etablissement/%s/' % (year, month, siret), **kwargs
-        )
+        return self.get('v3/dgfip/etablissements/%s/chiffres_affaires' % siret, raw=True, **kwargs)
 
     @endpoint(
         perm='can_access',
@@ -511,18 +454,17 @@ class APIEntreprise(BaseResource):
     def match_mandataire_social(
         self, request, siren, first_name, last_name, birthdate, method='simple', **kwargs
     ):
-        entreprise = self.get(
-            'v2/entreprises/%s/' % siren,
-            raw=True,
-            **kwargs,
-        )
+        mandataires = self.get(
+            'v3/infogreffe/rcs/unites_legales/%s/mandataires_sociaux' % siren, raw=True, **kwargs
+        ).get('data', [])
+
         methods = {
             'simple': simple_match,
             'levenshtein': levenshtein_match,
         }
         if method not in methods:
             return {'err': 1, 'err_desc': 'method %s not implemented' % method}
-        for mandataire in entreprise.get('entreprise', {}).get('mandataires_sociaux', []):
+        for mandataire in mandataires:
             if methods[method](mandataire, first_name, last_name, birthdate):
                 return {'err': 0, 'data': mandataire}
         return {'err': 0, 'data': {}}

passerelle/apps/api_particulier/migrations/0001_initial.py

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

passerelle/apps/api_particulier/migrations/0002_auto_20181118_0807.py

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

passerelle/apps/api_particulier/migrations/0003_auto_20190212_0426.py

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

passerelle/apps/api_particulier/migrations/0004_auto_20190215_0807.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api_particulier', '0003_auto_20190212_0426'),
     ]

passerelle/apps/api_particulier/migrations/0005_auto_20210610_1508.py

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

passerelle/apps/api_particulier/migrations/0006_api_key_length_1024.py

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

passerelle/apps/arcgis/migrations/0001_initial.py

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

passerelle/apps/arcgis/migrations/0002_auto_20170920_0951.py

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

passerelle/apps/arcgis/migrations/0003_auto_20181102_1550.py

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

passerelle/apps/arcgis/migrations/0004_remove_arcgis_log_level.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('arcgis', '0003_auto_20181102_1550'),
     ]

passerelle/apps/arcgis/migrations/0005_auto_20200310_1517.py

@@ -8,7 +8,6 @@ import passerelle.utils.templates
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('arcgis', '0004_remove_arcgis_log_level'),
     ]

passerelle/apps/arcgis/migrations/0006_auto_20200401_1025.py

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

passerelle/apps/arcgis/migrations/0007_token.py

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

passerelle/apps/arpege_ecp/migrations/0001_initial.py

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

passerelle/apps/arpege_ecp/migrations/0002_remove_arpegeecp_log_level.py

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

passerelle/apps/astech/migrations/0001_initial.py

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

passerelle/apps/astre_rest/migrations/0001_initial.py

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

passerelle/apps/astre_rest/migrations/0002_auth.py

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

passerelle/apps/astre_rest/models.py

@@ -172,7 +172,6 @@ AUTH_CHOICES = [
 
 
 class AstreREST(BaseResource):
-
     base_url = models.URLField(_('API URL'))
     username = models.CharField(_('Username'), max_length=32)
     password = models.CharField(_('Password'), max_length=32)

passerelle/apps/astregs/migrations/0001_initial.py

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

passerelle/apps/astregs/migrations/0002_auto_20191006_1501.py

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

passerelle/apps/atal/migrations/0001_initial.py

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

passerelle/apps/atos_genesys/migrations/0001_initial.py

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

passerelle/apps/atos_genesys/migrations/0002_remove_resource_log_level.py

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

passerelle/apps/atos_genesys/migrations/0003_auto_20200504_1402.py

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

passerelle/apps/atos_genesys/migrations/0004_text_to_jsonb.py

@@ -6,7 +6,6 @@ from passerelle.utils.db import EnsureJsonbType
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('atos_genesys', '0003_auto_20200504_1402'),
     ]

passerelle/apps/atos_genesys/migrations/0005_resource_http_timeout.py

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

passerelle/apps/atos_genesys/models.py

@@ -19,8 +19,8 @@ import xml.etree.ElementTree as ET
 from urllib import parse as urlparse
 
 import requests
-from django.contrib.postgres.fields import JSONField
 from django.db import models
+from django.db.models import JSONField
 from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource

passerelle/apps/base_adresse/migrations/0001_initial.py

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

passerelle/apps/base_adresse/migrations/0002_auto_20150705_0330.py

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

passerelle/apps/base_adresse/migrations/0003_baseaddresse_log_level.py

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

passerelle/apps/base_adresse/migrations/0004_auto_20160316_0910.py

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

passerelle/apps/base_adresse/migrations/0005_auto_20160407_0456.py

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

passerelle/apps/base_adresse/migrations/0006_rename_model.py

@@ -2,7 +2,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0005_auto_20160407_0456'),
     ]

passerelle/apps/base_adresse/migrations/0007_auto_20160729_1540.py

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

passerelle/apps/base_adresse/migrations/0008_delete_updatestreetmodel.py

@@ -2,7 +2,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0007_auto_20160729_1540'),
     ]

passerelle/apps/base_adresse/migrations/0009_streetmodel_simple_name.py

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

passerelle/apps/base_adresse/migrations/0010_auto_20160914_0826.py

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

passerelle/apps/base_adresse/migrations/0011_auto_20160919_0949.py

@@ -2,7 +2,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0010_auto_20160914_0826'),
     ]

passerelle/apps/base_adresse/migrations/0012_auto_20170920_0951.py

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

passerelle/apps/base_adresse/migrations/0013_remove_baseadresse_log_level.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0012_auto_20170920_0951'),
     ]

passerelle/apps/base_adresse/migrations/0014_auto_20190207_0456.py

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

passerelle/apps/base_adresse/migrations/0015_auto_20191206_1244.py

@@ -7,7 +7,6 @@ import passerelle.apps.base_adresse.models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0014_auto_20190207_0456'),
     ]

passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py

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

passerelle/apps/base_adresse/migrations/0017_auto_20200504_1402.py

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

passerelle/apps/base_adresse/migrations/0018_text_to_jsonb.py

@@ -6,7 +6,6 @@ from passerelle.utils.db import EnsureJsonbType
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0017_auto_20200504_1402'),
     ]

passerelle/apps/base_adresse/migrations/0019_streetmodel_resource_add.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("base_adresse", "0018_text_to_jsonb"),
     ]

passerelle/apps/base_adresse/migrations/0020_streetmodel_resource_runpython.py

@@ -13,7 +13,6 @@ def set_streetmodel_resource(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("base_adresse", "0019_streetmodel_resource_add"),
     ]

passerelle/apps/base_adresse/migrations/0021_streetmodel_resource_alter.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("base_adresse", "0020_streetmodel_resource_runpython"),
     ]

passerelle/apps/base_adresse/migrations/0022_resource_in_models_add.py

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

passerelle/apps/base_adresse/migrations/0023_resource_in_models_runpython.py

@@ -23,7 +23,6 @@ def set_resource(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0022_resource_in_models_add'),
     ]

passerelle/apps/base_adresse/migrations/0024_resource_in_models_alter.py

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

passerelle/apps/base_adresse/migrations/0025_baseadresse_sectors.py

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

passerelle/apps/base_adresse/migrations/0026_streetmodel_ban_id.py

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

passerelle/apps/base_adresse/migrations/0027_auto_20220603_0456.py

@@ -9,7 +9,6 @@ def forwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0026_streetmodel_ban_id'),
     ]

passerelle/apps/base_adresse/migrations/0028_alter_streetmodel_ban_id.py

@@ -9,7 +9,6 @@ def forwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0027_auto_20220603_0456'),
     ]

passerelle/apps/base_adresse/migrations/0029_auto_20220624_0827.py

@@ -2,7 +2,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('base_adresse', '0028_alter_streetmodel_ban_id'),
     ]

passerelle/apps/base_adresse/migrations/0030_auto_20220627_1511.py

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

passerelle/apps/base_adresse/models.py

@@ -5,10 +5,9 @@ import json
 from io import StringIO
 from urllib import parse as urlparse
 
-from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import FieldError
 from django.db import connection, models
-from django.db.models import Q
+from django.db.models import JSONField, Q
 from django.utils import timezone
 from django.utils.http import urlencode
 from django.utils.translation import gettext_lazy as _
@@ -679,7 +678,6 @@ class UnaccentNameMixin:
 
 
 class StreetModel(UnaccentNameMixin, models.Model):
-
     ban_id = models.CharField(_('BAN Identifier'), max_length=32, null=True)
     city = models.CharField(_('City'), max_length=150)
     name = models.CharField(_('Street name'), max_length=150)
@@ -699,7 +697,6 @@ class StreetModel(UnaccentNameMixin, models.Model):
 
 
 class RegionModel(UnaccentNameMixin, models.Model):
-
     name = models.CharField(_('Region name'), max_length=150)
     unaccent_name = models.CharField(_('Region name ascii char'), max_length=150, null=True)
     code = models.CharField(_('Region code'), max_length=3)
@@ -724,7 +721,6 @@ class RegionModel(UnaccentNameMixin, models.Model):
 
 
 class DepartmentModel(UnaccentNameMixin, models.Model):
-
     name = models.CharField(_('Department name'), max_length=100)
     unaccent_name = models.CharField(_('Department name ascii char'), max_length=150, null=True)
     code = models.CharField(_('Department code'), max_length=3)
@@ -752,7 +748,6 @@ class DepartmentModel(UnaccentNameMixin, models.Model):
 
 
 class CityModel(UnaccentNameMixin, models.Model):
-
     name = models.CharField(_('City name'), max_length=150)
     unaccent_name = models.CharField(_('City name ascii char'), max_length=150, null=True)
     code = models.CharField(_('INSEE code'), max_length=5)

passerelle/apps/bbb/migrations/0001_initial.py

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

passerelle/apps/bbb/models.py

@@ -18,10 +18,10 @@ import hashlib
 import time
 import uuid
 
-from django.contrib.postgres.fields import JSONField
 from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
 from django.db import models, transaction
+from django.db.models import JSONField
 from django.http import HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse

passerelle/apps/bdp/admin.py

@@ -3,8 +3,6 @@ from django.contrib import admin
 from passerelle.apps.bdp.models import Bdp
 
 
+@admin.register(Bdp)
 class BdpAdmin(admin.ModelAdmin):
     prepopulated_fields = {'slug': ('title',)}
-
-
-admin.site.register(Bdp, BdpAdmin)

passerelle/apps/bdp/migrations/0001_initial.py

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

passerelle/apps/bdp/migrations/0002_bdp_log_level.py

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

passerelle/apps/bdp/migrations/0003_auto_20160316_0910.py

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

passerelle/apps/bdp/migrations/0004_auto_20160407_0456.py

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

passerelle/apps/bdp/migrations/0005_auto_20170920_0951.py

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

passerelle/apps/bdp/migrations/0006_remove_bdp_log_level.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('bdp', '0005_auto_20170920_0951'),
     ]

passerelle/apps/cartads_cs/migrations/0001_initial.py

@@ -6,7 +6,6 @@ import passerelle.apps.cartads_cs.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py

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

passerelle/apps/cartads_cs/migrations/0003_cartadsdossier_name_id.py

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

passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py

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

passerelle/apps/cartads_cs/migrations/0005_cartadsfile_sent_to_cartads.py

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

passerelle/apps/cartads_cs/migrations/0006_cartadscs_client_name.py

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

passerelle/apps/cartads_cs/migrations/0007_auto_20190923_1711.py

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

passerelle/apps/cartads_cs/migrations/0008_auto_20190923_1712.py

@@ -13,7 +13,6 @@ def migrate_subscribers(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('cartads_cs', '0007_auto_20190923_1711'),
     ]

passerelle/apps/cartads_cs/migrations/0009_cartadsdossier_formdata_url.py

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

passerelle/apps/cartads_cs/migrations/0010_cartadsdossier_cartads_cache_code_acces.py

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

passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py

@@ -5,7 +5,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('cartads_cs', '0010_cartadsdossier_cartads_cache_code_acces'),
     ]

passerelle/apps/cartads_cs/migrations/0012_text_to_jsonb.py

@@ -6,7 +6,6 @@ from passerelle.utils.db import EnsureJsonbType
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('cartads_cs', '0011_cartadsdossier_cartads_cache_infos'),
     ]

passerelle/apps/cartads_cs/migrations/0013_cartadsdossier_deleted.py

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

passerelle/apps/cartads_cs/models.py

@@ -30,10 +30,10 @@ import pdfrw.findobjs
 import zeep.helpers as zeep_helpers
 from Cryptodome.Cipher import AES
 from django.conf import settings
-from django.contrib.postgres.fields import JSONField
 from django.core.files.storage import default_storage
 from django.core.signing import Signer
 from django.db import models
+from django.db.models import JSONField
 from django.http import HttpResponse
 from django.urls import reverse
 from django.utils.encoding import force_str
@@ -101,7 +101,6 @@ class CartaDSDossier(models.Model):
 
 
 class AbstractCartaDSCS(BaseResource):
-
     wsdl_base_url = models.URLField(
         _('WSDL Base URL'), help_text=_('ex: https://example.net/adscs/webservices/')
     )
@@ -279,7 +278,7 @@ class AbstractCartaDSCS(BaseResource):
                 data_cache.save()
 
         # pieces
-        for (type_dossier_id, objet_demande_id) in types_dossiers_objets_demandes_tuples:
+        for type_dossier_id, objet_demande_id in types_dossiers_objets_demandes_tuples:
             resp = client.service.GetPieces(self.get_token(), type_dossier_id, objet_demande_id)
             if resp is None:
                 continue
@@ -508,7 +507,6 @@ class AbstractCartaDSCS(BaseResource):
         pieces = cerfa_pieces + required_pieces + optional_pieces
         known_files = CartaDSFile.objects.filter(tracking_code=tracking_code)
         for piece in pieces:
-
             if request:
                 upload_url = request.build_absolute_uri(
                     '%supload/%s/%s/' % (self.get_absolute_url(), piece['id'], upload_token)

passerelle/apps/choosit/migrations/0001_initial.py

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

passerelle/apps/choosit/migrations/0002_auto_20160316_0528.py

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

passerelle/apps/choosit/migrations/0003_auto_20160316_0910.py

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

passerelle/apps/choosit/migrations/0004_auto_20160407_0456.py

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

passerelle/apps/choosit/migrations/0005_choositsmsgateway_default_trunk_prefix.py

@@ -3,7 +3,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('choosit', '0004_auto_20160407_0456'),
     ]