From 66ecd35b3493497377bcc7552d124539f0ac6ba1 Mon Sep 17 00:00:00 2001 From: Igor Ilic <30923996+dexters1@users.noreply.github.com> Date: Wed, 30 Apr 2025 09:42:59 +0200 Subject: [PATCH] fix: s3fs version fix [COG-2025] (#798) ## Description Fix issue with failing versions gh actions ## DCO Affirmation I affirm that all code in every commit of this pull request conforms to the terms of the Topoteretes Developer Certificate of Origin. --- poetry.lock | 2 +- pyproject.toml | 6 ++++-- uv.lock | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/poetry.lock b/poetry.lock index b4a8ad3d9..603d93da6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -11972,4 +11972,4 @@ weaviate = ["weaviate-client"] [metadata] lock-version = "2.1" python-versions = ">=3.10,<=3.13" -content-hash = "8ef9af57a2718509290e2c893a8c03df16c11af92a644876c9271a1e97b32ec1" +content-hash = "3bceceedcc14d649181c255eae55057103e8a3ec55df3250988249fd0176cb78" diff --git a/pyproject.toml b/pyproject.toml index 14c74c73b..dcefadc76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,10 @@ dependencies = [ "nltk==3.9.1", "numpy>=1.26.4, <=2.1", "pandas==2.2.3", - "boto3>=1.26.125,<2", + # Note: New s3fs and boto3 versions don't work well together + # Always use comaptible fixed versions of these two dependencies + "s3fs==2025.3.2", + "boto3==1.37.1", "botocore>=1.35.54,<2", "sqlalchemy==2.0.39", "aiosqlite>=0.20.0,<0.21", @@ -55,7 +58,6 @@ dependencies = [ "dlt[sqlalchemy]>=1.9.0,<2", "sentry-sdk[fastapi]>=2.9.0,<3", "structlog>=25.2.0,<26", - "s3fs>=2025.3.2,<2026", ] [project.optional-dependencies] diff --git a/uv.lock b/uv.lock index ef3211e86..e864fa770 100644 --- a/uv.lock +++ b/uv.lock @@ -1009,7 +1009,7 @@ requires-dist = [ { name = "alembic", specifier = ">=1.13.3,<2" }, { name = "anthropic", marker = "extra == 'anthropic'", specifier = ">=0.26.1,<0.27" }, { name = "asyncpg", marker = "extra == 'postgres'", specifier = "==0.30.0" }, - { name = "boto3", specifier = ">=1.26.125,<2" }, + { name = "boto3", specifier = "==1.37.1" }, { name = "botocore", specifier = ">=1.35.54,<2" }, { name = "chromadb", marker = "extra == 'chromadb'", specifier = ">=0.3.0,<0.7" }, { name = "coverage", marker = "extra == 'dev'", specifier = ">=7.3.2,<8" }, @@ -1074,7 +1074,7 @@ requires-dist = [ { name = "qasync", marker = "extra == 'gui'", specifier = ">=0.27.1,<0.28" }, { name = "qdrant-client", marker = "extra == 'qdrant'", specifier = ">=1.9.0,<2" }, { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.9.2,<1.0.0" }, - { name = "s3fs", specifier = ">=2025.3.2,<2026" }, + { name = "s3fs", specifier = "==2025.3.2" }, { name = "scikit-learn", specifier = ">=1.6.1,<2" }, { name = "sentry-sdk", extras = ["fastapi"], specifier = ">=2.9.0,<3" }, { name = "sqlalchemy", specifier = "==2.0.39" }, @@ -1810,17 +1810,17 @@ resolution-markers = [ "python_full_version >= '3.12' and python_full_version < '3.12.4'", ] dependencies = [ - { name = "huggingface-hub", marker = "python_full_version >= '3.12'" }, - { name = "loguru", marker = "python_full_version >= '3.12'" }, - { name = "mmh3", marker = "python_full_version >= '3.12'" }, - { name = "numpy", marker = "python_full_version >= '3.12'" }, - { name = "onnx", marker = "python_full_version >= '3.12'" }, - { name = "onnxruntime", marker = "python_full_version >= '3.12'" }, - { name = "pillow", marker = "python_full_version >= '3.12'" }, - { name = "py-rust-stemmers", marker = "python_full_version >= '3.12'" }, - { name = "requests", marker = "python_full_version >= '3.12'" }, - { name = "tokenizers", marker = "python_full_version >= '3.12'" }, - { name = "tqdm", marker = "python_full_version >= '3.12'" }, + { name = "huggingface-hub", marker = "python_full_version == '3.12.*'" }, + { name = "loguru", marker = "python_full_version == '3.12.*'" }, + { name = "mmh3", marker = "python_full_version == '3.12.*'" }, + { name = "numpy", marker = "python_full_version == '3.12.*'" }, + { name = "onnx", marker = "python_full_version == '3.12.*'" }, + { name = "onnxruntime", marker = "python_full_version == '3.12.*'" }, + { name = "pillow", marker = "python_full_version == '3.12.*'" }, + { name = "py-rust-stemmers", marker = "python_full_version == '3.12.*'" }, + { name = "requests", marker = "python_full_version == '3.12.*'" }, + { name = "tokenizers", marker = "python_full_version == '3.12.*'" }, + { name = "tqdm", marker = "python_full_version == '3.12.*'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/02/f0/8d935e8ea2408ccd34405ccb61bbcc340633597841e56e621cc5c4768405/fastembed-0.4.2.tar.gz", hash = "sha256:4065344ed795c2c860f31953ab9ead91291ce77952a3f7823ae64e3c8dc1a21c", size = 42084 } wheels = [ @@ -3808,8 +3808,8 @@ name = "loguru" version = "0.7.3" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, - { name = "win32-setctime", marker = "sys_platform == 'win32'" }, + { name = "colorama", marker = "python_full_version < '3.13' and sys_platform == 'win32'" }, + { name = "win32-setctime", marker = "python_full_version < '3.13' and sys_platform == 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/3a/05/a1dae3dffd1116099471c643b8924f5aa6524411dc6c63fdae648c4f1aca/loguru-0.7.3.tar.gz", hash = "sha256:19480589e77d47b8d85b2c827ad95d49bf31b0dcde16593892eb51dd18706eb6", size = 63559 } wheels = [ @@ -4794,8 +4794,8 @@ name = "onnx" version = "1.17.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "numpy", marker = "python_full_version >= '3.12'" }, - { name = "protobuf", marker = "python_full_version >= '3.12'" }, + { name = "numpy", marker = "python_full_version == '3.12.*'" }, + { name = "protobuf", marker = "python_full_version == '3.12.*'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/9a/54/0e385c26bf230d223810a9c7d06628d954008a5e5e4b73ee26ef02327282/onnx-1.17.0.tar.gz", hash = "sha256:48ca1a91ff73c1d5e3ea2eef20ae5d0e709bb8a2355ed798ffc2169753013fd3", size = 12165120 } wheels = [