Merge pull request #13 from mattip/exe_name

use name,project in DEF_EXECUTABLE

Author: mattip

codespeed/views.py

@@ -74,12 +74,21 @@ def get_context_data(self, **kwargs):
             context['show_historical'] = False
             return context
 
-        baseline_exe = Executable.objects.get(
-            name=settings.DEF_BASELINE['executable'])
-        context['baseline'] = baseline_exe
-        default_exe = Executable.objects.get(name=settings.DEF_EXECUTABLE)
-        context['default_exe'] = default_exe
-        return context
+        try:
+            baseline_exe = Executable.objects.get(
+                name=settings.DEF_BASELINE['executable'])
+            context['baseline'] = baseline_exe
+            def_name = settings.DEF_EXECUTABLE['name']
+            def_project = Project.objects.get(name=settings.DEF_EXECUTABLE['project'])
+            default_exe = Executable.objects.get(name=def_name,
+                                                 project=def_project,
+                                                )
+            context['default_exe'] = default_exe
+            return context
+        except Exception as e:
+            print('exception', e)
+            context['show_historical'] = False
+            return context
 
 
 @require_GET
@@ -109,7 +118,9 @@ def gethistoricaldata(request):
     data['baseline'] = '{} {}'.format(
         settings.DEF_BASELINE['executable'], baseline_lastrev.tag)
 
-    default_exe = Executable.objects.get(name=settings.DEF_EXECUTABLE)
+    def_name = settings.DEF_EXECUTABLE['name']
+    def_project = Project.objects.get(name=settings.DEF_EXECUTABLE['project'])
+    default_exe = Executable.objects.get(name=def_name, project=def_project)
     default_branch = Branch.objects.get(
         name=default_exe.project.default_branch,
         project=default_exe.project)

codespeed/views_data.py

@@ -107,7 +107,9 @@ def getdefaultexecutable():
     if (hasattr(settings, 'DEF_EXECUTABLE') and
             settings.DEF_EXECUTABLE is not None):
         try:
-            default = Executable.objects.get(name=settings.DEF_EXECUTABLE)
+            def_name = settings.DEF_EXECUTABLE['name']
+            def_project = Project.objects.get(name=settings.DEF_EXECUTABLE['project'])
+            default = Executable.objects.get(name=def_name, project=def_project)
         except Executable.DoesNotExist:
             pass
     if default is None:

speed_pypy/settings.py

@@ -79,6 +79,7 @@
 
 
 STATIC_URL = '/static/'
+STATIC_URL = 'https://speed.pypy.org/static/'
 STATIC_ROOT = os.path.join(BASEDIR, "sitestatic")
 STATICFILES_DIRS = (
     os.path.join(BASEDIR, 'static'),
@@ -87,7 +88,7 @@
 SHOW_REPORTS = False
 SHOW_HISTORICAL = True
 DEF_BASELINE = {'executable': 'cpython', 'revision': '3.6.7'}
-DEF_EXECUTABLE = 'pypy3-jit-64'
+DEF_EXECUTABLE = {'name': 'pypy3-jit-64', 'project': 'PyPy3.6'}
 DEF_ENVIRONMENT = 'benchmarker'