Merge branch 'master' into speed.python.org

Conflicts:
	setup.py

Both branches changed version.

Author: zware

.travis.yml

@@ -1,22 +1,21 @@
 language: python
 python:
-  - "2.6"
-  - "2.7"
-#  - "3.2"
-#  - "3.3"
-#  - "pypy"
-
+  - 2.6
+  - 2.7
+  - 3.4
 env:
-  - DJANGO_VERSION=1.6
-  - DJANGO_VERSION=1.5.5
-  - DJANGO_VERSION=1.4.9
-
-# command to install dependencies
+  - DJANGO_VERSION=1.8.5
+  - DJANGO_VERSION=1.6.11
+  - DJANGO_VERSION=1.4.22
+matrix:
+  exclude:
+    - python: 2.6
+      env: DJANGO_VERSION=1.8.5
+    - python: 3.4
+      env: DJANGO_VERSION=1.4.22
 install:
   - pip install -q Django==$DJANGO_VERSION
   - python setup.py install
-
-# command to run tests
 script:
   - python setup.py test
   - python manage.py test codespeed

CHANGELOG

@@ -1,5 +1,19 @@
 == Change Log ==
 
+=== Version 0.11a0 ===
+* 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
+
+
+=== Version 0.10.1, November 1, 2015 ===
+* NEW #169: nomeata added admin action to recalculate reports
+* NEW #169: nomeata increased allowed length for benchmark names to 100 chars
+* FIX #186: pepsiman fixed getting commit logs for non-default branches on mercurial
+* FIX #170: Show infinite increase instead of "-"
+* FIX: various admin fixes
+
+
 === Version 0.10.0, December 27, 2013 ===
 * NEW #108: AlekSi made executable names uniques per project instead of globally
 * NEW #148: staticfloat added the ability to set benchmark fields when saving results for a new benchmark

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-2014 Miquel Torres <tobami@gmail.com>
+Copyright (c) 2009-2015 Miquel Torres <tobami@gmail.com>
 
     This file is part of Codespeed.
 

README.md

@@ -1,15 +1,15 @@
 # Codespeed
 [![Build Status](https://travis-ci.org/tobami/codespeed.png?branch=master)](https://travis-ci.org/tobami/codespeed)
 
-A web application to monitor and analyze the performance of your code.
+Codespeed is a web application to monitor and analyze the performance of your code.
 
-Known to be used by [PyPy](http://speed.pypy.org), [Twisted](http://speed.twistedmatrix.com), [RubySpec](http://speed.rubyspec.org) and many more.
+Known to be used by [PyPy](http://speed.pypy.org), [Twisted](http://speed.twistedmatrix.com) and others.
 
 For an overview of some application concepts see the [wiki page](https://github.com/tobami/codespeed/wiki/Overview)
 
 # Installation
 
-You will need Python 2.6 or 2.7.
+You will need Python 2.7 or 3.4+.
 
 To install dependencies and the codespeed Django app:
 
@@ -33,13 +33,9 @@ can take a long time. Please be patient.
   the data to a database named `data.db`
 * Create the DB by typing from the root directory:
 
-        python manage.py syncdb
-
-* Create an admin user in the process.
-* Execute DB migrations:
-
         python manage.py migrate
 
+* Create an admin user in the process.
 * For testing purposes, you can now start the development server:
 
         python manage.py runserver 8000

codespeed/admin.py

@@ -56,7 +56,7 @@ class EnvironmentAdmin(admin.ModelAdmin):
 
 class ResultAdmin(admin.ModelAdmin):
     list_display = ('revision', 'benchmark', 'executable', 'environment',
-                    'value', 'date', 'environment')
+                    'value', 'date')
     list_filter = ('environment', 'executable', 'date', 'benchmark')
 
 admin.site.register(Result, ResultAdmin)