Merge branch 'speed.pypy.org' into mercurial

Author: mattip

codespeed/models.py

@@ -475,7 +475,7 @@ def get_changes_table(self, trend_depth=10, force_save=False):
                     val_max = "-"
 
                 # Calculate percentage change relative to previous result
-                result = resobj.value
+                result = max(resobj.value, 0)
                 change = "-"
                 if len(change_list):
                     c = change_list.filter(benchmark=bench)

codespeed/settings.py

@@ -2,7 +2,7 @@
 """Default settings for Codespeed"""
 
 ## General default options ##
-WEBSITE_NAME = "MySpeedSite" # This name will be used in the reports RSS feed
+WEBSITE_NAME = "PyPy's Speed Center" # This name will be used in the reports RSS feed
 
 DEF_ENVIRONMENT = None # Name of the environment which should be selected as default
 

codespeed/static/css/main.css

@@ -119,7 +119,7 @@ div#presentation div.menubox {
 }
 div#presentation div.menubox:hover { border: 5px solid #FFCE9C; }
 
-div#presentation p { height: 5em; padding-left: 120px; }
+div#presentation div.menubox p { height: 5em; padding-left: 120px; }
 
 div#presentation div#changes p {
     background: url(../images/changes.png) no-repeat;

codespeed/static/images/favicon.ico

@@ -94,12 +94,20 @@ def gethistoricaldata(request):
     # Fetch Baseline data
     baseline_exe = Executable.objects.get(
         name=settings.DEF_BASELINE['executable'])
-    baseline_lastrev = Revision.objects.filter(
-        branch__project=baseline_exe.project).order_by('-date')[0]
+    baseline_revs = Revision.objects.filter(
+        branch__project=baseline_exe.project).order_by('-date')
+    baseline_lastrev = baseline_revs[0]
+    for rev in baseline_revs:
+        baseline_results = Result.objects.filter(
+            executable=baseline_exe, revision=rev, environment=env)
+        if baseline_results:
+            baseline_lastrev = rev
+            break
+    if len(baseline_results) == 0:
+        logger.error('Could not find results for {} rev="{}" env="{}"'.format(
+                baseline_exe, baseline_lastrev, env))
     data['baseline'] = '{} {}'.format(
         settings.DEF_BASELINE['executable'], baseline_lastrev.tag)
-    baseline_results = Result.objects.filter(
-        executable=baseline_exe, revision=baseline_lastrev, environment=env)
 
     default_exe = Executable.objects.get(name=settings.DEF_EXECUTABLE)
     default_branch = Branch.objects.get(
@@ -108,21 +116,24 @@ def gethistoricaldata(request):
 
     # Fetch tagged revisions for default executable
     default_taggedrevs = Revision.objects.filter(
-        branch=default_branch
-    ).exclude(tag="").order_by('date')
-    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs]
+            branch=default_branch
+        ).exclude(tag="").order_by('date')
     default_results = {}
     for rev in default_taggedrevs:
-        default_results[rev.tag] = Result.objects.filter(
+        res = Result.objects.filter(
             executable=default_exe, revision=rev, environment=env)
-
+        if not res:
+            logger.info('no results for %s %s %s' % (str(default_exe), str(rev), str(env)))
+            continue
+        default_results[rev.tag] = res
+    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs if rev.tag in default_results]
     # Fetch data for latest results
     revs = Revision.objects.filter(
         branch=default_branch).order_by('-date')[:5]
     default_lastrev = None
     for i in range(4):
         default_lastrev = revs[i]
-        if default_lastrev.results.filter(executable=default_exe):
+        if default_lastrev.results.filter(executable=default_exe, environment=env):
             break
         default_lastrev = None
     if default_lastrev is None:
@@ -892,7 +903,6 @@ def add_result(request):
         return HttpResponseBadRequest(response)
     else:
         create_report_if_enough_data(response[0], response[1], response[2])
-        logger.debug("add_result: completed")
         return HttpResponse("Result data saved successfully", status=202)
 
 
@@ -917,15 +927,11 @@ def add_json_results(request):
         else:
             unique_reports.add(response)
 
-    logger.debug("add_json_results: about to create reports")
     for rep in unique_reports:
         create_report_if_enough_data(rep[0], rep[1], rep[2])
 
-    logger.debug("add_json_results: completed")
-
     return HttpResponse("All result data saved successfully", status=202)
 
-
 def django_has_content_type():
     return (django.VERSION[0] > 1 or
             (django.VERSION[0] == 1 and django.VERSION[1] >= 6))

codespeed/static/js/jqplot/jqplot.pointLabels.min.js

@@ -0,0 +1,3 @@
+.
+psycopg2==2.7.7
+gunicorn==19.9.0

codespeed/views.py

@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+# Django settings for a speedcenter project.
+import os
+import os.path
+import sys
+
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+BASEDIR = os.path.dirname(__file__)
+
+#: The directory which should contain checked out source repositories:
+REPOSITORY_BASE_PATH = os.path.join(BASEDIR, "repos")
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASEDIR, 'data.db'),
+    }
+}
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = False
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = os.path.join(BASEDIR, "media")
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = '/media/'
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'as%n_m#)^vee2pe91^^@c))sl7^c6t-9r8n)_69%)2yt+(la2&'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    # 'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+if DEBUG:
+    import traceback
+    import logging
+
+    # Define a class that logs unhandled errors
+    class LogUncatchedErrors:
+        def process_exception(self, request, exception):
+            logging.error("Unhandled Exception on request for %s\n%s" %
+                                 (request.build_absolute_uri(),
+                                  traceback.format_exc()))
+    # And add it to the middleware classes
+    MIDDLEWARE_CLASSES += ('settings.LogUncatchedErrors',)
+
+    # set shown level of logging output to debug
+    logging.basicConfig(level=logging.DEBUG)
+
+
+ROOT_URLCONF = 'example.urls'
+
+TEMPLATE_DIRS = (
+    os.path.join(os.path.dirname(__file__), 'templates'),
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.contrib.auth.context_processors.auth',
+    'django.contrib.messages.context_processors.messages',
+    'django.core.context_processors.debug',
+    'django.core.context_processors.i18n',
+    'django.core.context_processors.media',
+    'django.core.context_processors.static',
+    'django.core.context_processors.request',
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    #'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.staticfiles',
+    'codespeed',
+    'south'
+)
+
+STATIC_URL = '/static/'
+
+STATIC_ROOT = os.path.join(BASEDIR, "sitestatic")
+
+# Codespeed settings that can be overwritten here.
+## General default options ##
+WEBSITE_NAME = "PyPy Speed Center" # This name will be used in the reports RSS feed
+
+#DEF_ENVIRONMENT = None #Name of the environment which should be selected as default
+
+
+DEF_BASELINE = {'executable': 'cpython', 'revision': '101'} # Which executable + revision should be default as a baseline
+                    # Given as the name of the executable and commitid of the revision
+                    # Example: defaultbaseline = {'executable': 'myexe', 'revision': '21'}
+
+#TREND = 10 # Default value for the depth of the trend
+           # Used by reports for the latest runs and changes view
+
+# Threshold that determines when a performance change over the last result is significant
+CHANGE_THRESHOLD = 5.0
+
+# Threshold that determines when a performance change
+# over a number of revisions is significant
+TREND_THRESHOLD  = 6.0
+
+## Changes view options ##
+#DEF_EXECUTABLE = None # Executable that should be chosen as default in the changes view
+                      # Given as the name of the executable.
+                      # Example: defaultexecutable = "myexe"
+
+## Timeline view options ##
+#DEF_BENCHMARK = "grid" # Default selected benchmark. Possible values:
+                       #   "grid": will show the grid of plots
+                       #   "show_none": will just show a text message
+                       #   "mybench": will select benchmark "mybench"
+
+#TIMELINE_BRANCHES = True # NOTE: Only the default branch is currently shown 
+                         # Get timeline results for specific branches
+                         # Set to False if you want timeline plots and results only for trunk.
+
+## Comparison view options ##
+#CHART_TYPE = 'normal bars' # The options are 'normal bars', 'stacked bars' and 'relative bars'
+
+NORMALIZATION = True # True will enable normalization as the default selection
+                      # in the Comparison view. The default normalization can be
+                      # chosen in the defaultbaseline setting
+
+#CHART_ORIENTATION = 'vertical' # 'vertical' or 'horizontal can be chosen as
+                              # default chart orientation
+
+COMP_EXECUTABLES = [('pypy-c-jit', 'L'), ('pypy-c', 'L')]  # Which executable + revision should be checked as default
+                         # Given as a list of tuples containing the
+                         # name of an executable + commitid of a revision
+                         # An 'L' denotes the last revision
+                         # Example:
+                         # COMP_EXECUTABLES = [
+                         #     ('myexe', '21df2423ra'),
+                         #     ('myexe', 'L'),]
+
+from .local_settings import *
+