Skip to content

Commit

Permalink
chore(deps): Mise à jour des dépendances (#1416)
Browse files Browse the repository at this point in the history
  • Loading branch information
raphodn authored Aug 27, 2024
1 parent eba1796 commit 5f2aa1f
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 24.8.0
hooks:
- id: black
language_version: python3
Expand Down
1 change: 1 addition & 0 deletions config/settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
# For Docker env (and debug toolbar in particular)
import socket


_, _, ips = socket.gethostbyname_ex(socket.gethostname())
INTERNAL_IPS = [ip[: ip.rfind(".")] + ".1" for ip in ips] + ["127.0.0.1"]

Expand Down
6 changes: 3 additions & 3 deletions lemarche/siaes/management/commands/import_esat_from_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ def handle(self, *args, **options): # noqa C901
"siret": siret,
"contact_email": email,
"contact_phone": phone,
"employees_insertion_count": int(employees_count)
if employees_count and employees_count != "#N/D"
else None,
"employees_insertion_count": (
int(employees_count) if employees_count and employees_count != "#N/D" else None
),
"employees_insertion_count_last_updated": timezone.now(),
"import_raw_object": data.copy(),
"kind": siae_constants.KIND_ESAT,
Expand Down
1 change: 1 addition & 0 deletions lemarche/utils/templatetags/theme_inclusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Exist also in the base code of C1 :
https://github.com/betagouv/itou/blob/master/itou/utils/templatetags/theme_inclusion.py
"""

from django import template
from django.templatetags.static import static
from django.utils.safestring import mark_safe
Expand Down
2 changes: 1 addition & 1 deletion lemarche/www/dashboard_siaes/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from django.views.generic.base import RedirectView

from lemarche.www.dashboard_siaes.views import (
SiaeEditActivitiesDeleteView,
SiaeEditActivitiesCreateView,
SiaeEditActivitiesDeleteView,
SiaeEditActivitiesEditView,
SiaeEditActivitiesView,
SiaeEditContactView,
Expand Down
13 changes: 8 additions & 5 deletions lemarche/www/siaes/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1032,11 +1032,14 @@ def test_search_query_no_result(self):
mock_siaes_similarity_search.assert_called_once()

def test_search_query_with_results(self):
with mock.patch(
"lemarche.utils.apis.api_elasticsearch.siaes_similarity_search"
) as mock_siaes_similarity_search, mock.patch(
"lemarche.utils.apis.api_elasticsearch.siaes_similarity_search_with_city"
) as mock_siaes_similarity_search_with_city:
with (
mock.patch(
"lemarche.utils.apis.api_elasticsearch.siaes_similarity_search"
) as mock_siaes_similarity_search,
mock.patch(
"lemarche.utils.apis.api_elasticsearch.siaes_similarity_search_with_city"
) as mock_siaes_similarity_search_with_city,
):
mock_siaes_similarity_search.return_value = [self.siae_two.pk, self.siae_three.pk, self.siae_four.pk]
url = self.url + "?semantic_q=entretien espace vert&id_semantic_city_name=&semantic_city="
response = self.client.get(url)
Expand Down
6 changes: 3 additions & 3 deletions lemarche/www/tenders/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ class Meta:

def __init__(self, tender_survey_transactioned_answer=None, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields[
"survey_transactioned_answer"
].label = "Avez-vous contractualisé avec un prestataire trouvé via le Marché de l'inclusion ?"
self.fields["survey_transactioned_answer"].label = (
"Avez-vous contractualisé avec un prestataire trouvé via le Marché de l'inclusion ?"
)
self.fields["survey_transactioned_amount"].label = "Quel est le montant de la transaction ? (facultatif)"
self.fields["survey_transactioned_feedback"].label = "Partagez-nous votre retour d'expérience (facultatif)"
self.fields["survey_transactioned_feedback"].widget.attrs.update(
Expand Down
64 changes: 32 additions & 32 deletions poetry.lock

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

36 changes: 18 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,55 @@ authors = []

[tool.poetry.dependencies]
boto = "^2.49.0"
boto3 = "^1.34.103"
boto3 = "^1.35.6"
crawlerdetect = "^0.1.7"
django = "4.2.15"
django-admin-list-filters = "^1.2"
django-anymail = "^8.6"
django-better-admin-arrayfield = "^1.4.2"
django-bootstrap4 = "^23.4"
django-ckeditor = "^6.7.1"
django-compressor = "^4.4"
django-compressor = "^4.5.1"
django-cors-headers = "^3.14.0"
django-environ = "^0.9.0"
django-environ = "^0.11.2"
django-extensions = "^3.2.3"
django-fieldsets-with-inlines = { git = "https://github.com/raphodn/django-fieldsets-with-inlines.git", branch = "master" }
django-filter = "^21.1"
django-formtools = "^2.5.1"
django-htmx = "^1.17.3"
django-htmx = "^1.19.0"
django-libsass = "^0.9"
django-select2 = "^7.11.1"
django-sesame = "^3.2.2"
django-storages = "^1.14.3"
djangorestframework = "^3.15.1"
drf-spectacular = "^0.26.5"
elastic-apm = "^6.22.0"
elasticsearch = "^8.13.1"
huey = "^2.5.0"
ipython = "^8.24.0"
django-storages = "^1.14.4"
djangorestframework = "^3.15.2"
drf-spectacular = "^0.27.2"
elastic-apm = "^6.23.0"
elasticsearch = "^8.15.0"
huey = "^2.5.1"
ipython = "^8.26.0"
langchain = "^0.1.20"
openai = "^0.28.1"
psycopg2-binary = "^2.9.9"
PyMySQL = "^1.1.0"
PyMySQL = "^1.1.1"
python = "^3.10.4"
python-stdnum = "^1.20"
redis = "^3.5.3"
requests = "^2.31.0"
requests = "^2.32.3"
sentry-sdk = "^1.45.0"
shortuuid = "^1.0.13"
sib-api-v3-sdk = "^7.6.0"
tiktoken = "^0.5.2"
wagtail = "^5.1.3"
whitenoise = "^6.6.0"
whitenoise = "^6.7.0"
xlwt = "^1.3.0"
django-phonenumber-field = {extras = ["phonenumbers"], version = "^7.3.0"}
django-simple-history = "^3.7.0"

[tool.poetry.group.dev.dependencies]
black = "^23.12.1"
coverage = "^7.5.1"
black = "^24.8.0"
coverage = "^7.6.1"
django-debug-toolbar = "^3.8.1"
factory-boy = "^3.3.0"
factory-boy = "^3.3.1"
flake8 = "^6.1.0"
freezegun = "^1.4.0"
ipdb = "^0.13.13"
Expand All @@ -63,7 +63,7 @@ poethepoet = "^0.12.3"
pre-commit = "^2.21.0"
pyproject-flake8 = "^6.1.0"
pytest-django = "^4.8.0"
selenium = "^4.20.0"
selenium = "^4.23.1"
tblib = "^2.0.0"

[tool.poetry.scripts]
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ asttokens==2.4.1 ; python_full_version >= "3.10.4" and python_full_version < "4.
async-timeout==4.0.3 ; python_full_version >= "3.10.4" and python_version < "3.11"
attrs==24.2.0 ; python_full_version >= "3.10.4" and python_version < "4.0"
beautifulsoup4==4.11.2 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
black==23.12.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
black==24.8.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
boto3==1.35.6 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
boto==2.49.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
botocore==1.35.6 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
Expand All @@ -34,7 +34,7 @@ django-ckeditor==6.7.1 ; python_full_version >= "3.10.4" and python_full_version
django-compressor==4.5.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-cors-headers==3.14.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-debug-toolbar==3.8.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-environ==0.9.0 ; python_full_version >= "3.10.4" and python_version < "4"
django-environ==0.11.2 ; python_full_version >= "3.10.4" and python_version < "4"
django-extensions==3.2.3 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-fieldsets-with-inlines @ git+https://github.com/raphodn/django-fieldsets-with-inlines.git@master ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-filter==21.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
Expand All @@ -54,7 +54,7 @@ django-treebeard==4.7.1 ; python_full_version >= "3.10.4" and python_full_versio
django==4.2.15 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
djangorestframework==3.15.2 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
draftjs-exporter==2.1.7 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
drf-spectacular==0.26.5 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
drf-spectacular==0.27.2 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
ecs-logging==2.2.0 ; python_full_version >= "3.10.4" and python_version < "4"
elastic-apm==6.23.0 ; python_full_version >= "3.10.4" and python_version < "4"
elastic-transport==8.15.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions requirements/staging.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ django-bootstrap4==23.4 ; python_full_version >= "3.10.4" and python_full_versio
django-ckeditor==6.7.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-compressor==4.5.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-cors-headers==3.14.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-environ==0.9.0 ; python_full_version >= "3.10.4" and python_version < "4"
django-environ==0.11.2 ; python_full_version >= "3.10.4" and python_version < "4"
django-extensions==3.2.3 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-fieldsets-with-inlines @ git+https://github.com/raphodn/django-fieldsets-with-inlines.git@master ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
django-filter==21.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
Expand All @@ -47,7 +47,7 @@ django-treebeard==4.7.1 ; python_full_version >= "3.10.4" and python_full_versio
django==4.2.15 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
djangorestframework==3.15.2 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
draftjs-exporter==2.1.7 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
drf-spectacular==0.26.5 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
drf-spectacular==0.27.2 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
ecs-logging==2.2.0 ; python_full_version >= "3.10.4" and python_version < "4"
elastic-apm==6.23.0 ; python_full_version >= "3.10.4" and python_version < "4"
elastic-transport==8.15.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"
Expand Down

0 comments on commit 5f2aa1f

Please sign in to comment.