Merge remote-tracking branch 'origin/main' into release

Author: ewdurbin

custom_storages/__init__.py

@@ -29,13 +29,16 @@ def get_comment_blocks(self, content):
         """
         return [
             (match.start(), match.end())
-            for match in re.finditer(r"\/\*.*?\*\/", content, flags=re.DOTALL)
+            for match in re.finditer(r'\/\*.*?\*\/', content, flags=re.DOTALL)
         ]
 
-    def url_converter(self, name, hashed_files, template=None, comment_blocks=[]):
+    def url_converter(self, name, hashed_files, template=None, comment_blocks=None):
         """
         Return the custom URL converter for the given file name.
         """
+        if comment_blocks is None:
+            comment_blocks = []
+
         if template is None:
             template = self.default_template
 

custom_storages.py custom_storages/storages.py

@@ -3,6 +3,6 @@ gunicorn==19.9.0
 raven==6.10.0
 
 # Heroku
-Whitenoise
-django-storages
-boto3
+Whitenoise==6.0.0  # 6.0.0 is latest version that supports Django 2.2
+django-storages==1.12.3  # 1.12.3 is latest version that supports Django 2.2
+boto3==1.26.165

prod-requirements.txt

@@ -45,6 +45,7 @@
 
 MEDIA_ROOT = os.path.join(BASE, 'media')
 MEDIA_URL = '/media/'
+MEDIAFILES_LOCATION = 'media'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files

pydotorg/settings/base.py

@@ -41,8 +41,8 @@
 ] + MIDDLEWARE
 
 MEDIAFILES_LOCATION = 'media'
-DEFAULT_FILE_STORAGE = 'custom_storages.MediaStorage'
-STATICFILES_STORAGE = 'custom_storages.PipelineManifestStorage'
+DEFAULT_FILE_STORAGE = 'custom_storages.storages.MediaStorage'
+STATICFILES_STORAGE = 'custom_storages.storages.PipelineManifestStorage'
 
 EMAIL_HOST = config('EMAIL_HOST')
 EMAIL_HOST_USER = config('EMAIL_HOST_USER')

pydotorg/settings/heroku.py

@@ -330,7 +330,7 @@ <h1 class="site-headline">
                             &nbsp;<span class="pre"><a href="/psf-landing/">Python Software Foundation</a></span>
                             &nbsp;<span class="pre"><a href="/about/legal/">Legal Statements</a></span>
                             &nbsp;<span class="pre"><a href="/privacy/">Privacy Policy</a></span>
-                            &nbsp;<span class="pre"><a href="/psf/sponsorship/sponsors/#heroku">Powered by Heroku</a></span>
+                            <!--&nbsp;<span class="pre"><a href="/psf/community-infrastructure">Powered by PSF Community Infrastructure</a></span>-->
                         </small></p>
                     </div>
 

templates/base.html

@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}