cleanup

diff --git a/setup.py b/setup.py
index 616cbc8a3757471396b6e81eee54fb02820f7ae4..72a28465ba09a61531e4816513b3719403f05d68 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from setuptools import setup, find_packages
+
+from setuptools import setup
 import sys
 from setuptools.command.test import test as TestCommand
 
+
 # Pytest
 class PyTest(TestCommand):
     def finalize_options(self):
@@ -19,7 +21,6 @@ class PyTest(TestCommand):
         sys.exit(errno)
 
 
-
 CLASSIFIERS = [
     'Intended Audience :: Science/Research',
     'Intended Audience :: Developers',
@@ -38,14 +39,14 @@ CLASSIFIERS = [
 KEYWORDS = 'audio analysis features extraction MIR transcoding graph visualize plot HTML5 interactive metadata player'
 
 setup(
-  name = "TimeSide",
-  url='https://github.com/yomguy/TimeSide/',
-  description = "open web audio processing framework",
-  long_description = open('README.rst').read(),
-  author = "Guillaume Pellerin, Paul Brossier, Thomas Fillon, Riccardo Zaccarelli, Olivier Guilyardi",
-  author_email = "yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
-  version = '0.5.7',
-  install_requires = [
+    name='TimeSide',
+    url='https://github.com/yomguy/TimeSide/',
+    description="open web audio processing framework",
+    long_description=open('README.rst').read(),
+    author="Guillaume Pellerin, Paul Brossier, Thomas Fillon, Riccardo Zaccarelli, Olivier Guilyardi",
+    author_email="yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
+    version='0.5.7',
+    install_requires=[
         'numpy',
         'mutagen',
         'pillow',
@@ -62,14 +63,14 @@ setup(
         'traits',
         'networkx'
         ],
-  platforms=['OS Independent'],
-  license='Gnu Public License V2',
-  classifiers = CLASSIFIERS,
-  keywords = KEYWORDS,
-  packages = ['timeside'],
-  include_package_data = True,
-  zip_safe = False,
-  scripts=['scripts/timeside-waveforms', 'scripts/timeside-launch'],
-  tests_require=['pytest'],
-  cmdclass = {'test': PyTest},
+    platforms=['OS Independent'],
+    license='Gnu Public License V2',
+    classifiers=CLASSIFIERS,
+    keywords=KEYWORDS,
+    packages=['timeside'],
+    include_package_data=True,
+    zip_safe=False,
+    scripts=['scripts/timeside-waveforms', 'scripts/timeside-launch'],
+    tests_require=['pytest'],
+    cmdclass={'test': PyTest},
     )

diff --git a/timeside/server/models.py b/timeside/server/models.py
index 731fdd0bdab73187b5d1e50a80133d39ac930f9c..6fa31ab988290b2d586a8f73fd2b87dc7821a9db 100644 (file)
--- a/timeside/server/models.py
+++ b/timeside/server/models.py
@@ -303,7 +303,7 @@ class Task(BaseResource):
 
             if not item.hdf5:
                 hdf5_file = str(self.experience.uuid) + '.hdf5'
-                item.hdf5 =  os.path.join(item_path, hdf5_file)
+                item.hdf5 = os.path.join(item_path, hdf5_file)
                 item.save()
             pipe.run()
             item.lock_setter(True)

diff --git a/timeside/server/views.py b/timeside/server/views.py
index 7a7f7c863bb6f13e3131bb2655870afddff3b82f..6a0c752d6f83f88838ca70f0103fcd902da4ce03 100644 (file)
--- a/timeside/server/views.py
+++ b/timeside/server/views.py
@@ -27,7 +27,6 @@ from django.http import HttpResponse, HttpResponseRedirect
 from rest_framework import viewsets
 from rest_framework.mixins import UpdateModelMixin
 
-import timeside
 from timeside.server.models import *
 from timeside.server.serializers import *