Merge pull request #2333 from piotr1212/whitenoise_4

Add support for WhiteNoise 4

requirements.txt

@@ -48,7 +48,7 @@ cairocffi
 git+git://github.com/graphite-project/whisper.git#egg=whisper
 # Ceres is optional
 # git+git://github.com/graphite-project/ceres.git#egg=ceres
-whitenoise==3.3.1
+whitenoise
 scandir
 urllib3
 six

webapp/graphite/app_settings.py

@@ -20,6 +20,17 @@
     import raven
 except ImportError:
     raven = None
+try:
+    import whitenoise
+except ImportError:
+    whitenoise = False
+else:
+    whitenoise_version = tuple(map(
+            int, getattr(whitenoise, '__version__', '0').split('.')))
+    # Configure WhiteNoise < 3.2 from wsgi.py
+    # http://whitenoise.evans.io/en/stable/changelog.html#v4-0
+    if whitenoise_version < (3, 2):
+        whitenoise = False
 
 #Django settings below, do not touch!
 APPEND_SLASH = False
@@ -70,6 +81,10 @@
   'django.contrib.auth.middleware.AuthenticationMiddleware',
   'django.contrib.messages.middleware.MessageMiddleware',
 )
+
+if whitenoise:
+    MIDDLEWARE += ('whitenoise.middleware.WhiteNoiseMiddleware', )
+
 # SessionAuthenticationMiddleware is enabled by default since 1.10 and
 # deprecated since 2.0
 if DJANGO_VERSION < (1, 10):

webapp/graphite/wsgi.py

@@ -18,12 +18,16 @@
 except ImportError:
     whitenoise = False
 else:
+    whitenoise_version = tuple(map(
+            int, getattr(whitenoise, '__version__', '0').split('.')))
     # WhiteNoise < 2.0.1 does not support Python 2.6
     if sys.version_info[:2] < (2, 7):
-        whitenoise_version = tuple(map(
-                int, getattr(whitenoise, '__version__', '0').split('.')))
         if whitenoise_version < (2, 0, 1):
             whitenoise = False
+    # Configure WhiteNoise >= 3.2 as middleware from app_settings.py
+    # http://whitenoise.evans.io/en/stable/changelog.html#v4-0
+    if whitenoise_version >= (3, 2):
+        whitenoise = False
 
 if whitenoise:
     from whitenoise.django import DjangoWhiteNoise