fix setup

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644 (file)
index 0000000..4b5c560
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,16 @@
+include AUTHORS
+include LICENSE
+include CHANGELOG
+include README.rst
+include INSTALL.rst
+recursive-include doc *
+recursive-include example *
+recursive-include telemeta/locale *
+recursive-include telemeta/templates *
+recursive-include telemeta/htdocs *
+recursive-include telemeta/backup *
+recursive-include telemeta/pages *
+recursive-exclude * *.pyc
+recursive-exclude dist *
+recursive-exclude build *
+recursive-exclude Telemeta.egg-info *

diff --git a/setup.py b/setup.py
index 1b872be953239598907bbd2e727308e8ab84902a..c56770f3c6a1ea618daa334a89752fb48762976d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,59 +1,26 @@
 # -*- coding: utf-8 -*-
-from distutils.core import setup
-from distutils.command.install import INSTALL_SCHEMES
+from setuptools import setup, find_packages
 import os
-import sys
+import telemeta
 
-def fullsplit(path, result=None):
-    """
-    Split a pathname into components (the opposite of os.path.join) in a
-    platform-neutral way.
-    """
-    if result is None:
-        result = []
-    head, tail = os.path.split(path)
-    if head == '':
-        return [tail] + result
-    if head == path:
-        return result
-    return fullsplit(head, [tail] + result)
-
-# Tell distutils to put the data_files in platform-specific installation
-# locations. See here for an explanation:
-# http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
-for scheme in INSTALL_SCHEMES.values():
-    scheme['data'] = scheme['purelib']
-
-# Compile the list of packages available, because distutils doesn't have
-# an easy way to do this.
-packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-if root_dir != '':
-    os.chdir(root_dir)
-telemeta_dir = 'telemeta'
-
-for dirpath, dirnames, filenames in os.walk(telemeta_dir):
-    # Ignore dirnames that start with '.'
-    for i, dirname in enumerate(dirnames):
-        if dirname.startswith('.'): del dirnames[i]
-    if '__init__.py' in filenames:
-        packages.append('.'.join(fullsplit(dirpath)))
-    elif filenames:
-        data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
-
-# Dynamically calculate the version based on telemeta.VERSION.
-version = __import__('telemeta').__version__
+CLASSIFIERS = ['Environment :: Web Environment', 'Framework :: Django', 'Intended Audience :: Science/Research', 'Intended Audience :: Education', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', 'Topic :: System :: Archiving',  ]
 
 setup(
   name = "Telemeta",
   url = "http://telemeta.org",
-  description = "Web Audio Content Management System",
+  description = "a web Audio Content Management System",
+  long_description = open('README.rst').read(), 
   author = ["Guillaume Pellerin", "Olivier Guilyardi", "Riccardo Zaccarelli"],
   author_email = ["yomguy@parisson.com","olivier@samalyse.com", "riccardo.zaccarelli@gmail.com"],
-  version = version,
-  packages = packages,
-  data_files = data_files,
-  intall_requires = ['timeside'],
-  classifiers = ['Environment :: Web Environment', 'Framework :: Django', 'Intended Audience :: Science/Research', 'Intended Audience :: Education', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', 'Topic :: System :: Archiving',  ], 
-  long_description = open('README.rst').read()
-  )
+  version = telemeta.__version__,
+  install_requires = [
+        'timeside', 
+        'Django>=1.2.5',
+  ],
+  platforms=['OS Independent'],
+  license='CeCILL v2',
+  classifiers = CLASSIFIERS, 
+  packages = find_packages(),
+  include_package_data = True,
+  zip_safe = False, 
+)