Switch to using whitenoise instead of Werkzeug for static files

Author: dstufft

config.rb

@@ -23,4 +23,6 @@
   FileUtils.rm(Dir["warehouse/static/compiled/**/#{File.basename(rel3)}-*#{File.extname(rel2)}"])
 
   system('wake') or raise("There was an error running wake")  # TODO: Figure out how to do this better
+
+  system('python -m whitenoise.gzip -q warehouse/static/compiled')
 end

setup.cfg

@@ -24,6 +24,7 @@ requires-dist =
     SQLAlchemy
     sqlalchemy-citext>=1.2.0
     Werkzeug
+    whitenoise>=0.11
 
     psycopg2; platform_python_implementation == 'CPython'
     psycopg2cffi; platform_python_implementation == 'PyPy'

setup.py

@@ -53,6 +53,7 @@ def recursive_glob(path, pattern, cutdirs=0):
     "SQLAlchemy",
     "sqlalchemy-citext>=1.2.0",
     "Werkzeug",
+    "whitenoise>=0.11",
 ]
 
 if platform.python_implementation() == "PyPy":

tests/test_application.py

@@ -154,12 +154,12 @@ def fake_view(*args, **kwargs):
 
 
 def test_static_middleware(monkeypatch):
-    SharedDataMiddleware = pretend.call_recorder(lambda app, c: app)
+    WhiteNoise = pretend.call_recorder(lambda app, root, prefix, max_age: app)
 
     monkeypatch.setattr(
         application,
-        "SharedDataMiddleware",
-        SharedDataMiddleware,
+        "WhiteNoise",
+        WhiteNoise,
     )
 
     Warehouse.from_yaml(
@@ -169,18 +169,18 @@ def test_static_middleware(monkeypatch):
         )),
     )
 
-    assert SharedDataMiddleware.calls == [
+    assert WhiteNoise.calls == [
         pretend.call(
             mock.ANY,
-            {
-                "/static/": os.path.abspath(
-                    os.path.join(
-                        os.path.dirname(warehouse.__file__),
-                        "static",
-                        "compiled",
-                    ),
+            root=os.path.abspath(
+                os.path.join(
+                    os.path.dirname(warehouse.__file__),
+                    "static",
+                    "compiled",
                 ),
-            },
+            ),
+            prefix="/static/",
+            max_age=31557600,
         )
     ]
 

warehouse/application.py

@@ -37,7 +37,8 @@
 from raven.middleware import Sentry
 from six.moves import urllib_parse
 from werkzeug.exceptions import HTTPException
-from werkzeug.wsgi import SharedDataMiddleware, responder
+from werkzeug.wsgi import responder
+from whitenoise import WhiteNoise
 
 import warehouse
 import warehouse.cli
@@ -160,17 +161,15 @@ def __init__(self, config, engine=None, redis=None):
             self.wsgi_app = Sentry(self.wsgi_app, Client(**self.config.sentry))
 
         # Serve the static files that are packaged as part of Warehouse
-        self.wsgi_app = SharedDataMiddleware(
+        self.wsgi_app = WhiteNoise(
             self.wsgi_app,
-            {
-                "/static/": os.path.abspath(
-                    os.path.join(
-                        os.path.dirname(warehouse.__file__),
-                        "static",
-                        "compiled",
-                    ),
+            root=os.path.abspath(
+                os.path.join(
+                    os.path.dirname(warehouse.__file__), "static", "compiled",
                 ),
-            },
+            ),
+            prefix="/static/",
+            max_age=31557600,
         )
 
     def __call__(self, environ, start_response):