Change sponsors page to read data from db instead of HTML include

Author: berinhard

warehouse/routes.py

@@ -48,13 +48,9 @@ def includeme(config):
     )
     # Redirect the old "sponsor PyPI" page to the sponsors page
     config.add_redirect("/sponsor/", "/sponsors/", domain=warehouse)
-    config.add_template_view(
+    config.add_route(
         "sponsors",
         "/sponsors/",
-        # Use the full resource path here to make it able to be overridden by
-        # pypi-theme.
-        "warehouse:templates/pages/sponsors.html",
-        view_kw={"has_translations": True},
     )
 
     # Our legal policies

warehouse/sponsors/views.py

@@ -0,0 +1,25 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from pyramid.view import view_config
+
+from warehouse.sponsors.models import Sponsor
+
+
+@view_config(
+    route_name="sponsors",
+    renderer="pages/sponsors.html",
+    has_translations=True,
+)
+def display_sponsors_page(request):
+    sponsors = request.db.query(Sponsor).all()
+    return {"sponsors": sponsors}

warehouse/templates/pages/sponsors.html

@@ -14,8 +14,6 @@
 {% extends "base.html" %}
 {% block title %}{% trans %}Sponsors{% endtrans %}{% endblock %}
 
-{% from "warehouse:templates/includes/sponsors.html" import sponsors %}
-
 {% block content %}
 <div class="horizontal-section">
   <div class="site-container">
@@ -117,7 +115,7 @@ <h2 class="sponsor-grid__sponsor-name">Your company here</h2>
         {% if sponsor.psf_sponsor %}
         <div class="sponsor-grid__sponsor">
           <div class="sponsor-grid__sponsor-img">
-            <img src="{{ request.static_path('warehouse:static/dist/images/sponsors/color/' + sponsor.image) }}" alt="{{ sponsor.name }}">
+            <img src="{{ sponsor.color_logo_url }}" alt="{{ sponsor.name }}">
           </div>
           <h2 class="sponsor-grid__sponsor-name">{{ sponsor.name }}</h2>
           <div class="sponsor-grid__sponsor-activity">
@@ -142,7 +140,7 @@ <h2 class="centered-heading__title">Infrastructure sponsors</h2>
         {% if sponsor.infra_sponsor %}
         <div class="sponsor-grid__sponsor">
           <div class="sponsor-grid__sponsor-img">
-            <img src="{{ request.static_path('warehouse:static/dist/images/sponsors/color/' + sponsor.image) }}" alt="{{ sponsor.name }}">
+            <img src="{{ sponsor.color_logo_url }}" alt="{{ sponsor.name }}">
           </div>
           <div class="sponsor-grid__sponsor-description">
             <h2>{{ sponsor.name }}</h2>
@@ -180,7 +178,7 @@ <h2 class="sponsor-grid__sponsor-name">Your company here</h2>
         {% if sponsor.one_time %}
         <div class="sponsor-grid__sponsor">
           <div class="sponsor-grid__sponsor-img">
-            <img src="{{ request.static_path('warehouse:static/dist/images/sponsors/color/' + sponsor.image) }}" alt="{{ sponsor.name }}">
+            <img src="{{ sponsor.color_logo_url }}" alt="{{ sponsor.name }}">
           </div>
           <div class="sponsor-grid__sponsor-description">
             <h2>{{ sponsor.name }}</h2>