Revert "Provides the same json files as product details from our data…

…base"

kickoff-web.py

@@ -51,11 +51,5 @@ def auth(environ, username, password):
             '/cron/': path.join(path.dirname(__file__), 'cron/')
         })
 
-    # We serve (at least) a stastic json file
-    from werkzeug import SharedDataMiddleware
-    app.wsgi_app = SharedDataMiddleware(app.wsgi_app, {
-        '/json/': path.join(path.dirname(__file__), 'json/')
-    })
-
     app.wsgi_app = AuthBasicHandler(app.wsgi_app, "Release kick-off", auth)
     app.run(port=options.port, host=options.host)

kickoff/__init__.py

@@ -6,8 +6,6 @@
 app = Flask(__name__)
 db = SQLAlchemy()
 
-# We do need this import to make sure json endpoints are available
-import kickoff.jsonexport  # NOQA
 from kickoff.log import cef_event, CEF_WARN
 from kickoff.views.csrf import CSRFView
 from kickoff.views.releases import ReleasesAPI, Releases, ReleaseAPI, ReleaseL10nAPI, Release, ReleaseCommentAPI

kickoff/model.py

@@ -2,7 +2,6 @@
 
 import pytz
 import json
-import re
 
 from sqlalchemy import func
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -19,7 +18,6 @@ class Release(object):
     submitter = db.Column(db.String(250), nullable=False)
     _submittedAt = db.Column('submittedAt', db.DateTime(pytz.utc),
                              nullable=False, default=datetime.utcnow)
-    _shippedAt = db.Column('shippedAt', db.DateTime(pytz.utc))
     version = db.Column(db.String(10), nullable=False)
     buildNumber = db.Column(db.Integer(), nullable=False)
     branch = db.Column(db.String(50), nullable=False)
@@ -44,20 +42,10 @@ def submittedAt(self):
     def submittedAt(self, submittedAt):
         self._submittedAt = submittedAt
 
-    # Dates are always returned in UTC time and ISO8601 format to make them
-    # as transportable as possible.
-    @hybrid_property
-    def shippedAt(self):
-        return pytz.utc.localize(self._shippedAt).isoformat()
-
-    @shippedAt.setter
-    def shippedAt(self, shippedAt):
-        self._shippedAt = shippedAt
-
     def __init__(self, submitter, version, buildNumber, branch,
                  mozillaRevision, l10nChangesets, dashboardCheck,
                  mozillaRelbranch, enUSPlatforms=None, submittedAt=None,
-                 shippedAt=None, comment=None):
+                 comment=None):
         self.name = getReleaseName(self.product, version, buildNumber)
         self.submitter = submitter
         self.version = version.strip()
@@ -70,8 +58,6 @@ def __init__(self, submitter, version, buildNumber, branch,
         self.enUSPlatforms = enUSPlatforms
         if submittedAt:
             self.submittedAt = submittedAt
-        if shippedAt:
-            self.shippedAt = shippedAt
         if comment:
             self.comment = comment
 
@@ -80,7 +66,6 @@ def toDict(self):
         for c in self.__table__.columns:
             me[c.name] = getattr(self, c.name)
         me['submittedAt'] = me['submittedAt']
-        me['shippedAt'] = me['shippedAt']
         return me
 
     @classmethod
@@ -209,7 +194,7 @@ def getReleaseTable(release):
         raise ValueError("Can't find release table for release %s" % release)
 
 
-def getReleases(ready=None, complete=None, status=None, productFilter=None, versionFilter=None, versionFilterCategory=None, searchOtherShipped=False, lastRelease=None):
+def getReleases(ready=None, complete=None, status=None, productFilter=None, versionFilter=None, searchOtherShipped=False):
     filters = {}
     if ready is not None:
         filters['ready'] = ready
@@ -226,22 +211,8 @@ def getReleases(ready=None, complete=None, status=None, productFilter=None, vers
     releases = []
     for table in tables:
         if filters:
-            if lastRelease:
-                # Retrieve the last X version
-                results = table.query.filter_by(**filters).order_by(table._submittedAt.desc()).limit(40)
-            else:
-                results = table.query.filter_by(**filters)
-            for r in results:
-                if not versionFilterCategory:
-                    releases.append(r)
-                else:
-                    # We are using a manual filter here.
-                    # we are not doing it through SQL because:
-                    # * regexp queries are not really standard in SQL
-                    # * sqlalchemy does not provide a wrapper for this
-                    for versionFilter in versionFilterCategory:
-                        if re.match(versionFilter, r.version):
-                            releases.append(r)
+            for r in table.query.filter_by(**filters):
+                releases.append(r)
         else:
             for r in table.query.all():
                 releases.append(r)

kickoff/templates/base.html

@@ -30,7 +30,7 @@ <h1>Ship it</h1>
 </div><!-- topbar -->
 {% block content %}{% endblock %}
 <div id="footer">
-<a href="https://github.com/mozilla/ship-it/">Source code</a> / <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Release%20Engineering&component=Ship%20It">Report bug</a> / <a href="{{ url_for('json_exports') }}">JSON exports</a>
+<a href="https://github.com/mozilla/ship-it/">Source code</a> / <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Release%20Engineering&component=Ship%20It">Report bug</a>
 </div>
 </body>
 </html>