Skip to content

Commit

Permalink
Fix setup
Browse files Browse the repository at this point in the history
  • Loading branch information
areski committed Aug 9, 2011
1 parent 005a4f2 commit ded08c4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion install/conf/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ django-picklefield==0.1.9
django-urlauth==0.1.1
django-uuidfield
docutils
kombu==1.0.2
kombu==1.1.0
pyparsing==1.5.5
python-dateutil==1.5
redis==2.4.5
Expand Down
24 changes: 22 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,24 @@
pass

Distribution({
"setup_requires": add_django_dependency and ['Django >=1.2.0'] or []
"setup_requires": add_django_dependency and ['Django >=1.3.0'] or []
})



COMMANDS = {}
try:
from sphinx.setup_command import BuildDoc
COMMANDS['build_sphinx'] = BuildDoc
except ImportError:
pass
try:
from sphinx_pypi_upload import UploadDoc
COMMANDS['upload_sphinx'] = UploadDoc
except ImportError:
pass


# Compile the list of packages available, because distutils doesn't have
# an easy way to do this.
packages, data_files, temp_data_files, addons_data_files = [], [], [], []
Expand Down Expand Up @@ -79,7 +93,7 @@ def parse_dependency_links(file_name, install_flag=False):
author_email='[email protected]',
url='http://www.newfies-dialer.org/',
download_url='https://github.com/Star2Billing/newfies-dialer/tarball/master',
packages=['newfies'],
packages=find_packages(),
include_package_data=True,
license='AGPL License',
classifiers=[
Expand All @@ -96,6 +110,12 @@ def parse_dependency_links(file_name, install_flag=False):
install_requires = parse_requirements('install/conf/requirements.txt'),
dependency_links = parse_dependency_links('install/conf/requirements.txt',
install_flag),
extras_require = {
'async': ['celery'],
},

# devel
cmdclass = COMMANDS,
)


0 comments on commit ded08c4

Please sign in to comment.