Skip to content

Commit

Permalink
Màj des dépendances (#1144)
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehenry authored Feb 19, 2024
2 parents b413635 + 0f7d89b commit 87fd049
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 103 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ repos:
language: system
pass_filenames: false
- repo: https://github.com/psf/black
rev: 23.10.1
rev: 24.2.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 6.1.0
rev: 7.0.0
hooks:
- id: flake8
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
7 changes: 3 additions & 4 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ django-phonenumber-field = {version = "~=7.0", extras = ["phonenumberslite"]}
django-referrer-policy = "==1.0"
django-reverse-admin = "==2.9.6"
gunicorn = "==20.1.0"
uvicorn = "==0.23.2"
markdown = "~=3.5"
metabasepy = "==1.12.0"
mjml-python = "==1.1.0"
Expand All @@ -50,7 +49,7 @@ pre-commit = "~=3.1"
selenium = "~=4.4"
tblib = "*"
# pre-commit dependencies
black = "==23.10.1"
flake8 = "==6.1.0"
black = "==24.2.0"
flake8 = "==7.0.0"
pre-commit-hooks = "==4.5.0"
isort = "==5.12.0"
isort = "==5.13.2"
119 changes: 53 additions & 66 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions aidants_connect/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.2/ref/settings/
"""

import logging
import os
import re
Expand Down
6 changes: 3 additions & 3 deletions aidants_connect_common/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ class ZRRResource(ModelResource):

def __init__(self, commune_zrr_classification, **kwargs):
super().__init__(**kwargs)
self.fields[
"zrr"
].widget.commune_zrr_classification = commune_zrr_classification
self.fields["zrr"].widget.commune_zrr_classification = (
commune_zrr_classification
)

def skip_row(self, instance, original, row, import_validation_errors=None):
if not original.insee_code:
Expand Down
6 changes: 3 additions & 3 deletions aidants_connect_habilitation/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,9 @@ def merge_kwargs(prefix):

return {
**local_kwargs,
"prefix": prefix
if not previous_prefix
else f"{prefix}_{previous_prefix}",
"prefix": (
prefix if not previous_prefix else f"{prefix}_{previous_prefix}"
),
}

self._errors = None
Expand Down
6 changes: 3 additions & 3 deletions aidants_connect_habilitation/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,9 @@ def get_form_kwargs(self):
aidant_qs = self.organisation.aidant_requests

if aidant_qs.count() > 0:
form_kwargs[
f"{PersonnelForm.AIDANTS_FORMSET_PREFIX}_queryset"
] = aidant_qs.all()
form_kwargs[f"{PersonnelForm.AIDANTS_FORMSET_PREFIX}_queryset"] = (
aidant_qs.all()
)

if manager:
form_kwargs[f"{PersonnelForm.MANAGER_FORM_PREFIX}_instance"] = manager
Expand Down
24 changes: 12 additions & 12 deletions aidants_connect_web/statistics/reboarding.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,27 @@ def synchro_grist_data(
):
dict_update_grist = {"id": row_id}

dict_update_grist[
"Avant_session_nombre_connexions"
] = stats.connexions_before_reboarding
dict_update_grist["Avant_session_nombre_connexions"] = (
stats.connexions_before_reboarding
)
dict_update_grist["J30_nombre_connexions"] = stats.connexions_j30_after
dict_update_grist["J90_nombre_connexions"] = stats.connexions_j90_after

dict_update_grist[
"Avant_session_nombre_de_mandats_crees"
] = stats.created_mandats_before_reboarding
dict_update_grist["Avant_session_nombre_de_mandats_crees"] = (
stats.created_mandats_before_reboarding
)
dict_update_grist["J30_nombre_de_mandats_crees"] = stats.created_mandats_j30_after
dict_update_grist["J90_nombre_de_mandats_crees"] = stats.created_mandats_j90_after

dict_update_grist[
"Avant_session_nombre_de_demarches_realisees"
] = stats.demarches_before_reboarding
dict_update_grist["Avant_session_nombre_de_demarches_realisees"] = (
stats.demarches_before_reboarding
)
dict_update_grist["J30_nombre_de_demarches_realisees"] = stats.demarches_j30_after
dict_update_grist["J90_nombre_de_demarches_realisees"] = stats.demarches_j90_after

dict_update_grist[
"Avant_session_nombre_usagers_accompagnes"
] = stats.usagers_before_reboarding
dict_update_grist["Avant_session_nombre_usagers_accompagnes"] = (
stats.usagers_before_reboarding
)
dict_update_grist["J30_nombre_usagers_accompagnes"] = stats.usagers_j30_after
dict_update_grist["J90_nombre_usagers_accompagnes"] = stats.usagers_j90_after

Expand Down
12 changes: 6 additions & 6 deletions aidants_connect_web/views/mandat.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ def process_consent_first_step(
):
return None
method = str(form.cleaned_data["remote_constent_method"]).lower()
process: Callable[
[Aidant, Organisation, MandatForm], None | HttpResponse
] = getattr(
self,
f"_process_{method}_first_step",
self._process_unknown_first_step,
process: Callable[[Aidant, Organisation, MandatForm], None | HttpResponse] = (
getattr(
self,
f"_process_{method}_first_step",
self._process_unknown_first_step,
)
)
return process(aidant, organisation, form)

Expand Down
Loading

0 comments on commit 87fd049

Please sign in to comment.