add manifest, fix setup

diff --git a/AUTHORS b/AUTHORS
new file mode 100644 (file)
index 0000000..fd946dc
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,5 @@
+Guillaume Pellerin <yomguy@parisson.com>
+Riccardo Zaccarelli <riccardo.zaccarelli@gmail.com>
+Paul Brossier <piem@piem.org>
+Olivier Guilyardi <olivier@samalyse.com>
+

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644 (file)
index 0000000..684b8a7
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include AUTHORS
+include LICENSE
+include README.rst
+include INSTALL.rst
+recursive-include timeside/tests *
+recursive-include timeside/tools *
+recursive-include timeside/doc *
+recursive-exclude * *.pyc
+recursive-exclude dist *
+recursive-exclude build *
+recursive-exclude TimeSide.egg-info *

diff --git a/setup.py b/setup.py
index 8e11243ee56d128537fc4d98d42a47ae5a060574..539f2537ba10befa0c936ed020409f52bc136a19 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,41 +1,32 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from setuptools import setup, find_packages
+import os
+import timeside
 
-'''The setup and build script for the python-twitter library.'''
+CLASSIFIERS = ['Intended Audience :: Science/Research', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', ],
 
-__author__ = 'yomguy@parisson.com'
-__version__ = '0.3.1'
+KEYWORDS = 'audio analyze transcode graph player metadata'
 
-
-# The base package metadata to be used by both distutils and setuptools
-METADATA = dict(
+setup(
   name = "TimeSide",
-  version = __version__,
-  py_modules = ['timeside'],
-  description='Web Audio Components',
-  author='Olivier Guilyardi, Paul Brossier, Guillaume Pellerin, Riccardo Zaccarelli',
-  author_email='yomguy@parisson.com',
-  license='Gnu Public License V2',
   url='http://code.google.com/p/timeside',
-  packages=['timeside','timeside.decoder','timeside.encoder','timeside.grapher',
-            'timeside.analyzer','timeside.tests','timeside.tests.api'],
-  keywords='audio analyze transcode graph player metadata',
-  install_requires = ['setuptools',],
+  description = "open web audio components",
+  long_description = open('README.rst').read(),
+  author = ["Guillaume Pellerin", "Olivier Guilyardi", "Riccardo Zaccarelli", "Paul Brossier"],
+  author_email = ["yomguy@parisson.com","olivier@samalyse.com", "riccardo.zaccarelli@gmail.com", "piem@piem.org"],
+  version = timeside.__version__,
+  install_requires = [
+           'setuptools',
+               'numpy',
+               'gst',
+  ],
+  platforms=['OS Independent'],
+  license='Gnu Public License V2',
+  py_modules = ['timeside'],
+  classifiers = CLASSIFIERS,
+  keywords = KEYWORDS, 
+  packages = find_packages(),
   include_package_data = True,
-  classifiers = ['Intended Audience :: Science/Research', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', ],
-  
+  zip_safe = False,
 )
-
-
-def Main():
-  # Use setuptools if available, otherwise fallback and use distutils
-  try:
-    import setuptools
-    setuptools.setup(**METADATA)
-  except ImportError:
-    import distutils.core
-    distutils.core.setup(**METADATA)
-
-
-if __name__ == '__main__':
-  Main()

diff --git a/timeside/__init__.py b/timeside/__init__.py
index 88a5c7cad2b835f236ff9f3357d8a814473d05a9..0d62329b8a4fe95112bb5cf7999c2f5ca0708745 100644 (file)
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -9,4 +9,7 @@ import timeside.decoder
 import timeside.encoder
 import timeside.grapher
 import timeside.analyzer
+import timeside.tests
 from timeside.core import *
+
+__version__ = '0.3.2'