wip/75442-upgrade-hooks #166

Merged
vdeniaud merged 7 commits from wip/75442-upgrade-hooks into main 2023-03-29 15:46:42 +02:00
467 changed files with 184 additions and 649 deletions

View File

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

2
README
View File

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

2
debian/control vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More