Dependencies: don't override get_available_name (Django Storages)

readthedocs/builds/storage.py

@@ -8,7 +8,6 @@
 )
 from django.core.exceptions import SuspiciousFileOperation
 from django.core.files.storage import FileSystemStorage
-from storages.utils import get_available_overwrite_name
 
 from readthedocs.core.utils.filesystem import safe_open
 from readthedocs.storage.rclone import RCloneLocal
@@ -47,16 +46,6 @@ def _dirpath(path):
 
         return path
 
-    def get_available_name(self, name, max_length=None):
-        """
-        Overrides Django's storage to always return the passed name (overwrite).
-
-        By default, Django will not overwrite files even if the same name is specified.
-        This changes that functionality so that the default is to use the same name and overwrite
-        rather than modify the path to not clobber files.
-        """
-        return get_available_overwrite_name(name, max_length=max_length)
-
     def delete_directory(self, path):
         """
         Delete all files under a certain path from storage.

requirements/deploy.txt

@@ -158,7 +158,7 @@ django-safemigrate==4.3
     # via -r requirements/pip.txt
 django-simple-history==3.0.0
     # via -r requirements/pip.txt
-django-storages[boto3]==1.14.3
+django-storages[boto3]==1.14.4
     # via -r requirements/pip.txt
 django-structlog==2.2.0
     # via -r requirements/pip.txt

requirements/docker.txt

@@ -168,7 +168,7 @@ django-safemigrate==4.3
     # via -r requirements/pip.txt
 django-simple-history==3.0.0
     # via -r requirements/pip.txt
-django-storages[boto3]==1.14.3
+django-storages[boto3]==1.14.4
     # via -r requirements/pip.txt
 django-structlog==2.2.0
     # via -r requirements/pip.txt

requirements/pip.in

@@ -152,10 +152,7 @@ django-cors-headers
 # User agent parsing - used for analytics purposes
 user-agents
 
-# Pinned because we need to remove the usage of
-# `get_available_overwrite_name` first
-# See https://github.com/readthedocs/readthedocs.org/pull/11505
-django-storages[boto3]==1.14.3
+django-storages[boto3]
 
 
 # Required only in development and linting

requirements/pip.txt

@@ -121,7 +121,7 @@ django-safemigrate==4.3
     # via -r requirements/pip.in
 django-simple-history==3.0.0
     # via -r requirements/pip.in
-django-storages[boto3]==1.14.3
+django-storages[boto3]==1.14.4
     # via -r requirements/pip.in
 django-structlog==2.2.0
     # via -r requirements/pip.in

requirements/testing.txt

@@ -165,7 +165,7 @@ django-safemigrate==4.3
     # via -r requirements/pip.txt
 django-simple-history==3.0.0
     # via -r requirements/pip.txt
-django-storages[boto3]==1.14.3
+django-storages[boto3]==1.14.4
     # via -r requirements/pip.txt
 django-structlog==2.2.0
     # via -r requirements/pip.txt