Merge pull request tobami#221 from tobami/normal-logging-level

Normal logging level

Author: tobami

.travis.yml

@@ -6,14 +6,16 @@ branches:
   only:
     - master
 env:
-  - DJANGO_VERSION=1.8.17
-  - DJANGO_VERSION=1.9.12
+  global:
+    - DJANGO_SETTINGS_MODULE=sample_project.settings
+  matrix:
+    - DJANGO_VERSION=1.8.18
+    - DJANGO_VERSION=1.9.13
 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

README.md

@@ -1,5 +1,6 @@
 # Codespeed
 [![Build Status](https://travis-ci.org/tobami/codespeed.png?branch=master)](https://travis-ci.org/tobami/codespeed)
+[![PyPI version](https://img.shields.io/pypi/v/codespeed.svg)](https://pypi.python.org/pypi/codespeed)
 
 Codespeed is a web application to monitor and analyze the performance of your code.
 

requirements.txt

@@ -1,3 +1,3 @@
-Django>=1.6,<1.9
+Django>=1.6,<1.10
 isodate>=0.4.7,<0.6
-matplotlib>=1.4.3
+matplotlib>=1.4.3,<2.0

sample_project/client.py

@@ -117,6 +117,6 @@ def save_to_speedcenter(url=None, project=None, commitid=None, executable=None,
     try:
         save_to_speedcenter(**kwargs)
         sys.exit(0)
-    except StandardError, e:
+    except StandardError as e:
         logging.error("Error saving results: %s", e)
         sys.exit(1)

sample_project/settings.py

@@ -52,21 +52,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-if DEBUG:
-    import traceback
-    import logging
-
-    # Define a class that logs unhandled errors
-    class LogUncatchedErrors:
-        def process_exception(self, request, exception):
-            logging.error("Unhandled Exception on request for %s\n%s",
-                          request.build_absolute_uri(), traceback.format_exc())
-    # And add it to the middleware classes
-    MIDDLEWARE_CLASSES += ('sample_project.settings.LogUncatchedErrors',)
-
-    # set shown level of logging output to debug
-    logging.basicConfig(level=logging.DEBUG)
-
 ROOT_URLCONF = '{0}.urls'.format(TOPDIR)
 
 TEMPLATE_DIRS = (

setup.py

@@ -8,8 +8,8 @@
     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.6,<1.9', 'isodate>=0.4.7,<0.6', 'matplotlib>=1.4.3'],
+    keywords=['benchmarking', 'visualization'],
+    install_requires=['django>=1.6,<1.10', 'isodate>=0.4.7,<0.6', 'matplotlib>=1.4.3,<2.0'],
     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,