From 74d6a543bfa41f88256c478682f8eb0e5740990e Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 11 Aug 2025 10:54:16 -0400 Subject: [PATCH 1/2] fix: Don't pin fs-s3fs in kernel.index It's unclear why this is pinned here in the first place. The only changes since this version that the fs-s3fs package has had is that the API has become stable and the underlying dependencies have been upgraded to newer versions. --- requirements/edx/kernel.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index 201ef61002..f92b110a06 100644 --- a/requirements/edx/kernel.in +++ b/requirements/edx/kernel.in @@ -91,7 +91,7 @@ edxval event-tracking enmerkar-underscore # Implements a underscore extractor for django-babel. fs -fs-s3fs==0.1.8 +fs-s3fs geoip2 # Python API for the GeoIP web services and databases glob2 # Enhanced glob module, used in openedx.core.lib.rooted_paths gunicorn From 7f1dbc2c27cc48f5424109ce94d7ff26a09f22c5 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 11 Aug 2025 14:03:32 -0400 Subject: [PATCH 2/2] chore: Run `make upgrade` --- requirements/edx/base.txt | 5 ++--- requirements/edx/development.txt | 5 ++--- requirements/edx/doc.txt | 5 ++--- requirements/edx/testing.txt | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0de500b22f..f83db850fa 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -588,13 +588,13 @@ frozenlist==1.7.0 # via # aiohttp # aiosignal -fs==2.0.27 +fs==2.4.16 # via # -r requirements/edx/kernel.in # fs-s3fs # openedx-django-pyfs # xblock -fs-s3fs==0.1.8 +fs-s3fs==1.1.1 # via # -r requirements/edx/kernel.in # openedx-django-pyfs @@ -1017,7 +1017,6 @@ pytz==2025.2 # edx-tincan-py35 # enterprise-integrated-channels # event-tracking - # fs # olxcleaner # ora2 # snowflake-connector-python diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index dadab1dc2c..6be7caad7e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -932,14 +932,14 @@ frozenlist==1.7.0 # -r requirements/edx/testing.txt # aiohttp # aiosignal -fs==2.0.27 +fs==2.4.16 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # fs-s3fs # openedx-django-pyfs # xblock -fs-s3fs==0.1.8 +fs-s3fs==1.1.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1781,7 +1781,6 @@ pytz==2025.2 # edx-tincan-py35 # enterprise-integrated-channels # event-tracking - # fs # olxcleaner # ora2 # snowflake-connector-python diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index e7915ebe48..ff777e5da9 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -684,13 +684,13 @@ frozenlist==1.7.0 # -r requirements/edx/base.txt # aiohttp # aiosignal -fs==2.0.27 +fs==2.4.16 # via # -r requirements/edx/base.txt # fs-s3fs # openedx-django-pyfs # xblock -fs-s3fs==0.1.8 +fs-s3fs==1.1.1 # via # -r requirements/edx/base.txt # openedx-django-pyfs @@ -1245,7 +1245,6 @@ pytz==2025.2 # edx-tincan-py35 # enterprise-integrated-channels # event-tracking - # fs # olxcleaner # ora2 # snowflake-connector-python diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9030af4a9d..3b816bebff 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -719,13 +719,13 @@ frozenlist==1.7.0 # -r requirements/edx/base.txt # aiohttp # aiosignal -fs==2.0.27 +fs==2.4.16 # via # -r requirements/edx/base.txt # fs-s3fs # openedx-django-pyfs # xblock -fs-s3fs==0.1.8 +fs-s3fs==1.1.1 # via # -r requirements/edx/base.txt # openedx-django-pyfs @@ -1357,7 +1357,6 @@ pytz==2025.2 # edx-tincan-py35 # enterprise-integrated-channels # event-tracking - # fs # olxcleaner # ora2 # snowflake-connector-python