Merge branch 'develop' into gilbert-ext4

[philo.git] / setup.py

diff --git a/setup.py b/setup.py
index 8f13ea5..8a91d14 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,54 +1,21 @@
 #!/usr/bin/env python
-
-from setuptools import setup
 import os
-
-
-# Shamelessly cribbed from django's setup.py file.
-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)
-
-# Compile the list of packages available, because distutils doesn't have
-# an easy way to do this. Shamelessly cribbed from django's setup.py file.
-packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-if root_dir != '':
-    os.chdir(root_dir)
-philo_dir = 'philo'
-
-for dirpath, dirnames, filenames in os.walk(philo_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]])
+from setuptools import setup, find_packages
 
 
 version = __import__('philo').VERSION
 
+
 setup(
        name = 'philo',
        version = '.'.join([str(v) for v in version]),
        url = "http://philocms.org/",
        description = "A foundation for developing web content management systems.",
-       long_description = open(os.path.join(root_dir, 'README')).read(),
+       long_description = open(os.path.join(os.path.dirname(__file__), 'README')).read(),
        maintainer = "iThink Software",
        maintainer_email = "contact@ithinksw.com",
-       packages = packages,
-       data_files = data_files,
+       packages = find_packages(),
+       include_package_data=True,
        
        classifiers = [
                'Environment :: Web Environment',
@@ -65,7 +32,6 @@ setup(
        
        install_requires = [
                'django>=1.3',
-               'python>=2.5.4',
                'django-mptt>0.4.2,==dev',
        ],
        extras_require = {
@@ -75,8 +41,9 @@ setup(
                'waldo-recaptcha': ['recaptcha-django'],
                'sobol-eventlet': ['eventlet'],
                'sobol-scrape': ['BeautifulSoup'],
+               'penfield': ['django-taggit>=0.9'],
        },
        dependency_links = [
                'https://github.com/django-mptt/django-mptt/tarball/master#egg=django-mptt-dev'
        ]
-)
\ No newline at end of file
+)