Merge branch 'master' into speed.python.org

Author: zware

.gitignore

@@ -1,4 +1,7 @@
 *.pyc
+*.swp
+*.swo
+.DS_Store
 *.db
 sample_project/repos/*
 speed_python/repos/*
@@ -7,4 +10,5 @@ speed_python/secret_key
 override
 build
 dist
-*.egg-info
+codespeed.egg-info/
+

.travis.yml

@@ -3,11 +3,12 @@ python:
   - 2.7
   - 3.4
 env:
-  - DJANGO_VERSION=1.8.5
+  - DJANGO_VERSION=1.8.8
   - DJANGO_VERSION=1.6.11
 install:
   - pip install -q Django==$DJANGO_VERSION
   - python setup.py install
 script:
   - python setup.py test
   - python manage.py test codespeed
+

CHANGELOG

@@ -1,10 +1,11 @@
 == Change Log ==
 
-=== Version 0.11a0 ===
+=== Version 0.11.0, July 31, 2016 ===
 * NEW #191: Django 1.7 and 1.8 support
-* NEW #192: Python 3.4 support
-* FIX #190: Upgrade to jqPlot 1.0.8 and jQuery 1.8
-
+* NEW #192: Initial Python 3.4 support
+* NEW #199: str4d upgraded all javascript libraries. Most importantly jqPlot to 1.0.9 and jQuery to 1.12.3
+* NEW #203: str4d implemented displaying of quartile and extrema bands on median benchmarks
+* NEW #295: javierhonduco gave the application a more modern look
 
 === Version 0.10.1, November 1, 2015 ===
 * NEW #169: nomeata added admin action to recalculate reports

LICENSE

@@ -1,7 +1,7 @@
 All files in this work, are now covered by the following copyright notice.
 Please note that included libraries in the media/ directory may have their own license.
 
-Copyright (c) 2009-2015 Miquel Torres <tobami@gmail.com>
+Copyright (c) 2009-2016 Miquel Torres <tobami@gmail.com>
 
     This file is part of Codespeed.
 

codespeed/admin.py

@@ -37,9 +37,10 @@ class ExecutableAdmin(admin.ModelAdmin):
 
 
 class BenchmarkAdmin(admin.ModelAdmin):
-    list_display = ('name', 'benchmark_type', 'description', 'units_title',
-                    'units', 'lessisbetter', 'default_on_comparison')
-    list_filter = ('lessisbetter',)
+    list_display = ('name', 'benchmark_type', 'data_type', 'description',
+                    'units_title', 'units', 'lessisbetter',
+                    'default_on_comparison')
+    list_filter = ('data_type','lessisbetter')
     ordering = ['name']
     search_fields = ('name', 'description')
 

codespeed/commits/exceptions.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
+
 class CommitLogError(Exception):
     """An error when trying to display commit log messages"""

codespeed/commits/git.py

@@ -16,7 +16,7 @@ def updaterepo(project, update=True):
             return
 
         p = Popen(['git', 'pull'], stdout=PIPE, stderr=PIPE,
-                    cwd=project.working_copy)
+                  cwd=project.working_copy)
 
         stdout, stderr = p.communicate()
         if p.returncode != 0:
@@ -27,7 +27,7 @@ def updaterepo(project, update=True):
     else:
         cmd = ['git', 'clone', project.repo_path, project.repo_name]
         p = Popen(cmd, stdout=PIPE, stderr=PIPE,
-                    cwd=settings.REPOSITORY_BASE_PATH)
+                  cwd=settings.REPOSITORY_BASE_PATH)
         logger.debug('Cloning Git repo {0} for project {1}'.format(
             project.repo_path, project))
         stdout, stderr = p.communicate()
@@ -43,9 +43,9 @@ def getlogs(endrev, startrev):
     updaterepo(endrev.branch.project, update=False)
 
     cmd = ["git", "log",
-            # NULL separated values delimited by 0x1e record separators
-            # See PRETTY FORMATS in git-log(1):
-            '--format=format:%h%x00%H%x00%at%x00%an%x00%ae%x00%s%x00%b%x1e']
+           # NULL separated values delimited by 0x1e record separators
+           # See PRETTY FORMATS in git-log(1):
+           '--format=format:%h%x00%H%x00%at%x00%an%x00%ae%x00%s%x00%b%x1e']
 
     if endrev.commitid != startrev.commitid:
         cmd.append("%s...%s" % (startrev.commitid, endrev.commitid))
@@ -67,7 +67,7 @@ def getlogs(endrev, startrev):
             subject, body) = log.split("\x00", 7)
 
         date = datetime.datetime.fromtimestamp(
-                                    int(date_t)).strftime("%Y-%m-%d %H:%M:%S")
+            int(date_t)).strftime("%Y-%m-%d %H:%M:%S")
 
         logs.append({'date': date, 'message': subject, 'commitid': commit_id,
                      'author': author_name, 'author_email': author_email,

codespeed/commits/github.py

@@ -48,15 +48,17 @@ def retrieve_revision(commit_id, username, project, revision=None):
             raise e
 
         if commit_json["message"] in ("Not Found", "Server Error",):
-            # We'll still cache these for a brief period of time to avoid making too many requests:
+            # We'll still cache these for a brief period of time to avoid
+            # making too many requests:
             cache.set(commit_url, commit_json, 300)
         else:
             # We'll cache successes for a very long period of time since
             # SCM diffs shouldn't change:
             cache.set(commit_url, commit_json, 86400 * 30)
 
     if commit_json["message"] in ("Not Found", "Server Error",):
-         raise CommitLogError("Unable to load %s: %s" % (commit_url, commit_json["message"]))
+        raise CommitLogError(
+            "Unable to load %s: %s" % (commit_url, commit_json["message"]))
 
     date = isodate.parse_datetime(commit_json['committer']['date'])
 
@@ -66,7 +68,8 @@ def retrieve_revision(commit_id, username, project, revision=None):
 
         # We need to convert the timezone-aware date to a naive (i.e.
         # timezone-less) date in UTC to avoid killing MySQL:
-        revision.date = date.astimezone(isodate.tzinfo.Utc()).replace(tzinfo=None)
+        revision.date = date.astimezone(
+            isodate.tzinfo.Utc()).replace(tzinfo=None)
         revision.author = commit_json['author']['name']
         revision.message = commit_json['message']
         revision.full_clean()
@@ -85,7 +88,7 @@ def retrieve_revision(commit_id, username, project, revision=None):
 def getlogs(endrev, startrev):
     if endrev != startrev:
         revisions = endrev.branch.revisions.filter(
-                        date__lte=endrev.date, date__gte=startrev.date)
+            date__lte=endrev.date, date__gte=startrev.date)
     else:
         revisions = [i for i in (startrev, endrev) if i.commitid]
 
@@ -105,23 +108,29 @@ def getlogs(endrev, startrev):
     last_rev_data = None
     revision_count = 0
     ancestor_found = False
-    #TODO: get all revisions between endrev and startrev,
+    # TODO: get all revisions between endrev and startrev,
     # not only those present in the Codespeed DB
 
     for revision in revisions:
-        last_rev_data = retrieve_revision(revision.commitid, username, project, revision)
+        last_rev_data = retrieve_revision(
+            revision.commitid, username, project, revision)
         logs.append(last_rev_data)
         revision_count += 1
-        ancestor_found = (startrev.commitid in [rev['sha'] for rev in last_rev_data['parents']])
+        ancestor_found = (
+            startrev.commitid in [
+                rev['sha'] for rev in last_rev_data['parents']])
 
     # Simple approach to find the startrev, stop after found or after
     # #GITHUB_REVISION_LIMIT revisions are fetched
     while (revision_count < GITHUB_REVISION_LIMIT
             and not ancestor_found
             and len(last_rev_data['parents']) > 0):
-        last_rev_data = retrieve_revision(last_rev_data['parents'][0]['sha'], username, project)
+        last_rev_data = retrieve_revision(
+            last_rev_data['parents'][0]['sha'], username, project)
         logs.append(last_rev_data)
         revision_count += 1
-        ancestor_found = (startrev.commitid in [rev['sha'] for rev in last_rev_data['parents']])
+        ancestor_found = (
+            startrev.commitid in [
+                rev['sha'] for rev in last_rev_data['parents']])
 
     return sorted(logs, key=lambda i: i['date'], reverse=True)

codespeed/migrations/0002_median.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codespeed', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='benchmark',
+            name='data_type',
+            field=models.CharField(default='U', max_length=1, choices=[('U', 'Mean'), ('M', 'Median')]),
+        ),
+        migrations.AddField(
+            model_name='result',
+            name='q1',
+            field=models.FloatField(null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name='result',
+            name='q3',
+            field=models.FloatField(null=True, blank=True),
+        ),
+    ]