From 896b011e88eb81fc969856adb39b754a3ef427d4 Mon Sep 17 00:00:00 2001
From: Kristin Aoki <42981026+KristinAoki@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:15:01 -0400
Subject: [PATCH] fix: downgrade django-storages to 1.14.3 (#35156)

* fix: downgrade django-storages to 1.14.3

* fix: change max version

* feat: Recompile Python dependencies (#35164)

Commit generated by workflow `openedx/edx-platform/.github/workflows/compile-python-requirements.yml@refs/heads/master`

Co-authored-by: KristinAoki <42981026+KristinAoki@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 requirements/constraints.txt     | 5 +++++
 requirements/edx/base.txt        | 3 ++-
 requirements/edx/development.txt | 3 ++-
 requirements/edx/doc.txt         | 3 ++-
 requirements/edx/testing.txt     | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 701841785a..1478e646ca 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -121,3 +121,8 @@ backports.zoneinfo;python_version<"3.9"  # Newer versions have zoneinfo availabl
 # Otherwise we see a failure while running the following command:
 # export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
 numpy<2.0.0
+
+# django-storages==1.14.4 breaks course imports
+# Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
+# as the default value of AWS_S3_FILE_OVERWRITE is True
+django-storages<1.14.4
\ No newline at end of file
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index db687ef9e7..408534bdbb 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -334,8 +334,9 @@ django-statici18n==2.5.0
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-django-storages==1.14.4
+django-storages==1.14.3
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
     #   edxval
 django-user-tasks==3.2.0
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 10415067b0..4dd01d4989 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -550,8 +550,9 @@ django-statici18n==2.5.0
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-django-storages==1.14.4
+django-storages==1.14.3
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edxval
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 6c7d3ab8e5..cc46728bc6 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -396,8 +396,9 @@ django-statici18n==2.5.0
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-django-storages==1.14.4
+django-storages==1.14.3
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edxval
 django-user-tasks==3.2.0
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 9029ceebeb..b7bb5f81d5 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -431,8 +431,9 @@ django-statici18n==2.5.0
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-django-storages==1.14.4
+django-storages==1.14.3
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edxval
 django-user-tasks==3.2.0