Fix setup.py to allow django 1.8, like requirements.txt

Author: tobami

.gitignore

@@ -4,3 +4,5 @@ sample_project/repos/*
 override
 build
 dist
+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,9 +1,9 @@
 == Change Log ==
 
-=== Version 0.11a0 ===
+=== Version 0.11a1 ===
 * 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
+* FIX #199: str4d upgraded all javascript libraries. Most importantly jqPlot to 1.0.9 and jQuery to 1.12.3
 
 
 === Version 0.10.1, November 1, 2015 ===

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.
 

requirements.txt

@@ -1,2 +1,3 @@
-Django>=1.4,<1.9
+Django>=1.6,<1.9
 isodate>=0.4.7,<0.6
+

setup.py

@@ -2,14 +2,14 @@
 
 setup(
     name='codespeed',
-    version='0.11.0a0',
+    version='0.11.0a1',
     author='Miquel Torres',
     author_email='tobami@gmail.com',
     url='https://github.com/tobami/codespeed',
     download_url="https://github.com/tobami/codespeed/tags",
     license='GNU Lesser General Public License version 2.1',
     keywords=["benchmarking", "visualization"],
-    install_requires=['django>=1.4,<1.8', 'isodate>=0.4.7,<0.6'],
+    install_requires=['django>=1.6,<1.9', 'isodate>=0.4.7,<0.6'],
     packages=find_packages(exclude=['ez_setup', 'sample_project']),
     description='A web application to monitor and analyze the performance of your code',
     include_package_data=True,
@@ -22,10 +22,10 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
     ]
 )