Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release

[philo.git] / setup.py

diff --git a/setup.py b/setup.py
index 8f13ea5..d3fa76b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,6 @@ setup(
        
        install_requires = [
                'django>=1.3',
        
        install_requires = [
                'django>=1.3',

-               'python>=2.5.4',

                'django-mptt>0.4.2,==dev',
        ],
        extras_require = {
                'django-mptt>0.4.2,==dev',
        ],
        extras_require = {


@@ -75,6 +74,7 @@ setup(
                'waldo-recaptcha': ['recaptcha-django'],
                'sobol-eventlet': ['eventlet'],
                'sobol-scrape': ['BeautifulSoup'],
                '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'
        },
        dependency_links = [
                'https://github.com/django-mptt/django-mptt/tarball/master#egg=django-mptt-dev'