update deps

Dockerfile

@@ -1,8 +1,9 @@
 FROM python:3.7
 WORKDIR /usr/src/app
-COPY requirements.txt requirements-production.txt /usr/src/app/
+COPY requirements.txt /usr/src/app/
 RUN groupadd -r tracontent && useradd -r -g tracontent tracontent && \
-    pip install --no-cache-dir -r requirements.txt -r requirements-production.txt
+    pip install --no-cache-dir -U pip setuptools wheel && \
+    pip install --no-cache-dir -r requirements.txt
 COPY . /usr/src/app
 RUN env DEBUG=1 python manage.py collectstatic --noinput && \
     python -m compileall -q . && \

content/models.py

@@ -213,9 +213,8 @@ def active_css(self):
 
 class RenderPageMixin(object):
     def render(self, request, **extra_vars):
-        vars = dict(extra_vars,
-            page=self,
-        )
+        vars = dict(page=self)
+        vars.update(extra_vars)
 
         return render(request, self.template, vars)
 

content/views.py

@@ -17,7 +17,6 @@
 
 @require_safe
 def content_page_view(request, path):
-    print('Lower view:', path)
     site_settings = request.site.site_settings
 
     # Look for redirect at the current path

kompassi_oauth2/backends.py

@@ -28,7 +28,7 @@ def user_meta_attrs_from_kompassi(kompassi_user):
 
 
 class KompassiOAuth2AuthenticationBackend(object):
-    def authenticate(self, oauth2_session=None, **kwargs):
+    def authenticate(self, request, oauth2_session=None, **kwargs):
         if oauth2_session is None:
             # Not ours (password login)
             return None