From dde69be43856e1671f1d9b12a8218ddb496e8f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Odini?= Date: Tue, 27 Aug 2024 18:47:30 +0200 Subject: [PATCH] fix(deps): revert la maj de django-storages (#1420) --- config/settings/prod.py | 2 +- config/settings/staging.py | 2 +- lemarche/utils/s3boto.py | 1 + poetry.lock | 14 +++++++------- pyproject.toml | 2 +- requirements/dev.txt | 4 ++-- requirements/staging.txt | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/config/settings/prod.py b/config/settings/prod.py index f2b277045..c62054bc7 100644 --- a/config/settings/prod.py +++ b/config/settings/prod.py @@ -23,7 +23,7 @@ MEDIA_URL = f"https://{S3_STORAGE_ENDPOINT_DOMAIN}/" # noqa # flake8: noqa F405 -STORAGES |= {"default": {"BACKEND": "storages.backends.s3.S3Storage"}} +STORAGES |= {"default": {"BACKEND": "lemarche.utils.s3boto.S3BotoStorage"}} # Sentry diff --git a/config/settings/staging.py b/config/settings/staging.py index 679f154f2..05282db66 100644 --- a/config/settings/staging.py +++ b/config/settings/staging.py @@ -26,7 +26,7 @@ MEDIA_URL = f"https://{S3_STORAGE_ENDPOINT_DOMAIN}/" # noqa # flake8: noqa F405 -STORAGES |= {"default": {"BACKEND": "storages.backends.s3.S3Storage"}} +STORAGES |= {"default": {"BACKEND": "lemarche.utils.s3boto.S3BotoStorage"}} # Sentry diff --git a/lemarche/utils/s3boto.py b/lemarche/utils/s3boto.py index c42aadabc..e5df110c0 100644 --- a/lemarche/utils/s3boto.py +++ b/lemarche/utils/s3boto.py @@ -1,5 +1,6 @@ # copy from django-storage-1.8 # replace force_text by force_str +# get_available_overwrite_name is removed in 1.14.4 import io import mimetypes import os diff --git a/poetry.lock b/poetry.lock index 4831689f6..886dd054f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1629,13 +1629,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"] [[package]] name = "httpx" -version = "0.27.1" +version = "0.27.2" description = "The next generation HTTP client." optional = false python-versions = ">=3.8" files = [ - {file = "httpx-0.27.1-py3-none-any.whl", hash = "sha256:10877266452bbb4c7949734e5febc52d040fdf66f9e7c6d644a679f276d37de4"}, - {file = "httpx-0.27.1.tar.gz", hash = "sha256:ce9d45798d6d047b7db67d7949e371f2b453105a53d8df315564b2483d346878"}, + {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"}, + {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"}, ] [package.dependencies] @@ -1993,13 +1993,13 @@ extended-testing = ["beautifulsoup4 (>=4.12.3,<5.0.0)", "lxml (>=4.9.3,<6.0)"] [[package]] name = "langsmith" -version = "0.1.104" +version = "0.1.105" description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform." optional = false python-versions = "<4.0,>=3.8.1" files = [ - {file = "langsmith-0.1.104-py3-none-any.whl", hash = "sha256:049cd312952a0db9f5edeed3b9a8616e66ef86e5490c835c8bb054569203b0d0"}, - {file = "langsmith-0.1.104.tar.gz", hash = "sha256:7892dfe452d143fba573d7eb28dbff3202d2f2daacab8c7276ffe4a850179d4d"}, + {file = "langsmith-0.1.105-py3-none-any.whl", hash = "sha256:a0098d0bc60ee79792109b0c1fef8252e21fd2dc424f4d902b8d9eb75160438b"}, + {file = "langsmith-0.1.105.tar.gz", hash = "sha256:a8717ef90f3f740c202aa6878da89d4581ff28998336b48b831a92b855c460c3"}, ] [package.dependencies] @@ -4353,4 +4353,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.10.4" -content-hash = "0fd3c921cf67d2f2df6c713e5c76d60717cefc7806b2979f212bb21514f7dae0" +content-hash = "138419accc76966576d4c8e6d521b942f523c81bbfcd2f16a581ead9525db903" diff --git a/pyproject.toml b/pyproject.toml index f9aca8efc..2243e6b9e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ django-htmx = "^1.19.0" django-libsass = "^0.9" django-select2 = "^7.11.1" django-sesame = "^3.2.2" -django-storages = "^1.14.4" +django-storages = "^1.14.3" djangorestframework = "^3.15.2" drf-spectacular = "^0.27.2" elastic-apm = "^6.23.0" diff --git a/requirements/dev.txt b/requirements/dev.txt index 017a2e31a..a050f3f44 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -73,7 +73,7 @@ greenlet==3.0.3 ; python_version < "3.13" and (platform_machine == "win32" or pl h11==0.14.0 ; python_full_version >= "3.10.4" and python_version < "4.0" html5lib==1.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" httpcore==1.0.5 ; python_full_version >= "3.10.4" and python_version < "4.0" -httpx==0.27.1 ; python_full_version >= "3.10.4" and python_version < "4.0" +httpx==0.27.2 ; python_full_version >= "3.10.4" and python_version < "4.0" huey==2.5.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" identify==2.6.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" idna==3.8 ; python_full_version >= "3.10.4" and python_version < "4.0" @@ -93,7 +93,7 @@ langchain-community==0.0.38 ; python_full_version >= "3.10.4" and python_version langchain-core==0.1.52 ; python_full_version >= "3.10.4" and python_version < "4.0" langchain-text-splitters==0.0.2 ; python_full_version >= "3.10.4" and python_version < "4.0" langchain==0.1.20 ; python_full_version >= "3.10.4" and python_version < "4.0" -langsmith==0.1.104 ; python_full_version >= "3.10.4" and python_version < "4.0" +langsmith==0.1.105 ; python_full_version >= "3.10.4" and python_version < "4.0" libsass==0.23.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" marshmallow==3.22.0 ; python_full_version >= "3.10.4" and python_version < "4.0" matplotlib-inline==0.1.7 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" diff --git a/requirements/staging.txt b/requirements/staging.txt index bf6761ce7..745670e42 100644 --- a/requirements/staging.txt +++ b/requirements/staging.txt @@ -61,7 +61,7 @@ greenlet==3.0.3 ; python_version < "3.13" and (platform_machine == "win32" or pl h11==0.14.0 ; python_full_version >= "3.10.4" and python_version < "4.0" html5lib==1.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" httpcore==1.0.5 ; python_full_version >= "3.10.4" and python_version < "4.0" -httpx==0.27.1 ; python_full_version >= "3.10.4" and python_version < "4.0" +httpx==0.27.2 ; python_full_version >= "3.10.4" and python_version < "4.0" huey==2.5.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" idna==3.8 ; python_full_version >= "3.10.4" and python_version < "4.0" inflection==0.5.1 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" @@ -77,7 +77,7 @@ langchain-community==0.0.38 ; python_full_version >= "3.10.4" and python_version langchain-core==0.1.52 ; python_full_version >= "3.10.4" and python_version < "4.0" langchain-text-splitters==0.0.2 ; python_full_version >= "3.10.4" and python_version < "4.0" langchain==0.1.20 ; python_full_version >= "3.10.4" and python_version < "4.0" -langsmith==0.1.104 ; python_full_version >= "3.10.4" and python_version < "4.0" +langsmith==0.1.105 ; python_full_version >= "3.10.4" and python_version < "4.0" libsass==0.23.0 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0" marshmallow==3.22.0 ; python_full_version >= "3.10.4" and python_version < "4.0" matplotlib-inline==0.1.7 ; python_full_version >= "3.10.4" and python_full_version < "4.0.0"