Merge branch 'add-flake-config'

Author: tobami

.travis.yml

@@ -2,13 +2,18 @@ language: python
 python:
   - 2.7
   - 3.4
+branches:
+  only:
+    - master
 env:
-  - DJANGO_VERSION=1.8.8
-  - DJANGO_VERSION=1.6.11
+  - DJANGO_VERSION=1.8.17
+  - DJANGO_VERSION=1.9.12
 install:
+  - pip install flake8
   - pip install -q Django==$DJANGO_VERSION
   - python setup.py install
+before_script:
+   flake8 codespeed
 script:
   - python setup.py test
   - python manage.py test codespeed
-

codespeed/admin.py

@@ -6,73 +6,67 @@
 from django.contrib import admin
 
 
+@admin.register(Project)
 class ProjectAdmin(admin.ModelAdmin):
     list_display = ('name', 'repo_type', 'repo_path', 'track')
 
-admin.site.register(Project, ProjectAdmin)
-
 
+@admin.register(Branch)
 class BranchAdmin(admin.ModelAdmin):
     list_display = ('name', 'project')
     list_filter = ('project',)
 
-admin.site.register(Branch, BranchAdmin)
-
 
+@admin.register(Revision)
 class RevisionAdmin(admin.ModelAdmin):
     list_display = ('commitid', 'branch', 'tag', 'date')
     list_filter = ('branch__project', 'branch', 'tag', 'date')
     search_fields = ('commitid', 'tag')
 
-admin.site.register(Revision, RevisionAdmin)
-
 
+@admin.register(Executable)
 class ExecutableAdmin(admin.ModelAdmin):
     list_display = ('name', 'description', 'id', 'project')
     list_filter = ('project',)
     ordering = ['name']
     search_fields = ('name', 'description', 'project__name')
 
-admin.site.register(Executable, ExecutableAdmin)
-
 
+@admin.register(Benchmark)
 class BenchmarkAdmin(admin.ModelAdmin):
     list_display = ('name', 'benchmark_type', 'data_type', 'description',
                     'units_title', 'units', 'lessisbetter',
                     'default_on_comparison')
-    list_filter = ('data_type','lessisbetter')
+    list_filter = ('data_type', 'lessisbetter')
     ordering = ['name']
     search_fields = ('name', 'description')
 
-admin.site.register(Benchmark, BenchmarkAdmin)
-
 
+@admin.register(Environment)
 class EnvironmentAdmin(admin.ModelAdmin):
     list_display = ('name', 'cpu', 'memory', 'os', 'kernel')
     ordering = ['name']
     search_fields = ('name', 'cpu', 'memory', 'os', 'kernel')
 
-admin.site.register(Environment, EnvironmentAdmin)
-
 
+@admin.register(Result)
 class ResultAdmin(admin.ModelAdmin):
     list_display = ('revision', 'benchmark', 'executable', 'environment',
                     'value', 'date')
     list_filter = ('environment', 'executable', 'date', 'benchmark')
 
-admin.site.register(Result, ResultAdmin)
-
 
 def recalculate_report(modeladmin, request, queryset):
     for report in queryset:
         report.save()
+
+
 recalculate_report.short_description = "Recalculate reports"
 
 
+@admin.register(Report)
 class ReportAdmin(admin.ModelAdmin):
     list_display = ('revision', 'summary', 'colorcode')
     list_filter = ('environment', 'executable')
     ordering = ['-revision']
     actions = [recalculate_report]
-
-admin.site.register(Report, ReportAdmin)

codespeed/commits/__init__.py

@@ -1 +1 @@
-from .logs import get_logs
+from .logs import get_logs  # noqa

codespeed/commits/git.py

@@ -69,23 +69,29 @@ def getlogs(endrev, startrev):
         tag = ""
 
         cmd = ["git", "describe", "--tags", commit_id]
-        Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=working_copy)
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=working_copy)
 
         try:
-            stdout, stderr = p.communicate()
+            stdout, stderr = proc.communicate()
         except ValueError:
             stdout = b''
             stderr = b''
 
-        if p.returncode == 0:
+        if proc.returncode == 0:
             tag = stdout
 
         date = datetime.datetime.fromtimestamp(
             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,
-                     'body': body, 'short_commit_id': short_commit_id,
-                     'tag': tag})
+        logs.append({
+            'date': date,
+            'message': subject,
+            'commitid': commit_id,
+            'author': author_name,
+            'author_email': author_email,
+            'body': body,
+            'short_commit_id': short_commit_id,
+            'tag': tag
+        })
 
     return logs

codespeed/commits/mercurial.py

@@ -19,7 +19,7 @@ def updaterepo(project, update=True):
             return
 
         p = Popen(['hg', 'pull', '-u'], stdout=PIPE, stderr=PIPE,
-                    cwd=project.working_copy)
+                  cwd=project.working_copy)
         stdout, stderr = p.communicate()
 
         if p.returncode != 0 or stderr:
@@ -32,7 +32,7 @@ def updaterepo(project, update=True):
         cmd = ['hg', '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 Mercurial repo {0} for project {1}'.format(
             project.repo_path, project))
         stdout, stderr = p.communicate()
@@ -48,9 +48,13 @@ def updaterepo(project, update=True):
 def getlogs(endrev, startrev):
     updaterepo(endrev.branch.project, update=False)
 
-    cmd = ["hg", "log",
-            "-r", "%s::%s" % (startrev.commitid, endrev.commitid),
-            "--template", "{rev}:{node|short}\n{node}\n{author|user}\n{author|email}\n{date}\n{tags}\n{desc}\n=newlog=\n"]
+    cmd = [
+        "hg", "log",
+        "-r", "%s::%s" % (startrev.commitid, endrev.commitid),
+        "--template",
+        ("{rev}:{node|short}\n{node}\n{author|user}\n{author|email}"
+         "\n{date}\n{tags}\n{desc}\n=newlog=\n")
+    ]
 
     working_copy = endrev.branch.project.working_copy
     p = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=working_copy)
@@ -66,8 +70,8 @@ def getlogs(endrev, startrev):
             elements = log.split('\n')[:-1]
             if len(elements) < 7:
                 # "Malformed" log
-                logs.append(
-                    {'date': '-', 'message': 'error parsing log', 'commitid': '-'})
+                logs.append({
+                    'date': '-', 'message': 'error parsing log', 'commitid': '-'})
             else:
                 short_commit_id = elements.pop(0)
                 commit_id = elements.pop(0)
@@ -81,13 +85,19 @@ def getlogs(endrev, startrev):
 
                 # Parse date
                 date = date.split('-')[0]
-                date = datetime.datetime.fromtimestamp(float(date)).strftime("%Y-%m-%d %H:%M:%S")
+                date = datetime.datetime.fromtimestamp(
+                    float(date)).strftime("%Y-%m-%d %H:%M:%S")
 
                 # Add changeset info
                 logs.append({
-                    'date': date, 'author': author_name,
-                    'author_email': author_email, 'message': message,
-                    'short_commit_id': short_commit_id, 'commitid': commit_id, 'tag': tag})
+                    'date': date,
+                    'author': author_name,
+                    'author_email': author_email,
+                    'message': message,
+                    'short_commit_id': short_commit_id,
+                    'commitid': commit_id,
+                    'tag': tag
+                })
     # Remove last log here because mercurial saves the short hast as commitid now
     if len(logs) > 1 and logs[-1].get('short_commit_id') == startrev.commitid:
         logs.pop()

codespeed/commits/subversion.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 """Subversion commit logs support"""
-# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
 from datetime import datetime
@@ -32,7 +31,9 @@ def getlogs(newrev, startrev):
     loglimit = 200
 
     def get_login(realm, username, may_save):
-        return True, newrev.branch.project.repo_user, newrev.branch.project.repo_pass, False
+        repo_user = newrev.branch.project.repo_user
+        repo_pass = newrev.branch.project.repo_pass
+        return True, repo_user, repo_pass, False
 
     client = pysvn.Client()
     if newrev.branch.project.repo_user != "":
@@ -43,7 +44,7 @@ def get_login(realm, username, may_save):
             client.log(
                 newrev.branch.project.repo_path,
                 revision_start=pysvn.Revision(
-                        pysvn.opt_revision_kind.number, startrev.commitid
+                    pysvn.opt_revision_kind.number, startrev.commitid
                 ),
                 revision_end=pysvn.Revision(
                     pysvn.opt_revision_kind.number, newrev.commitid

codespeed/images.py

@@ -47,7 +47,7 @@ def gen_image_from_results(result_data, width, height):
             font_sizes[idx] = 8
         elif value < 1000:
             font_sizes[idx] = 12
-    
+
     if result_data['relative']:
         font_sizes[0] -= 2
 

codespeed/models.py

@@ -122,7 +122,7 @@ def clean(self):
             raise ValidationError("Invalid commit id %s" % self.commitid)
         if self.branch.project.repo_type == "S":
             try:
-                long(self.commitid)
+                int(self.commitid)
             except ValueError:
                 raise ValidationError("Invalid SVN commit id %s" % self.commitid)