Skip to content

Commit

Permalink
require simplejson on <Python-2.6
Browse files Browse the repository at this point in the history
Similar to ticket buildbot#700 - we should use the same technique there.
  • Loading branch information
Dustin J. Mitchell committed Feb 13, 2010
1 parent 46f5834 commit bdb4bd1
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions setup.py
Expand Up @@ -230,17 +230,25 @@ def finalize_options(self):
'sdist_test': SdistTestCommand},
}

py_25 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 5)
py_26 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 6)

try:
# If setuptools is installed, then we'll add setuptools-specific arguments
# to the setup args.
import setuptools #@UnusedImport
except ImportError:
pass
else:
## dependencies
setup_args['install_requires'] = [
'twisted >= 2.0.0',
'Jinja2'
]
# Python-2.6 and up includes json
if not py_26:
setup_args['install_requires'].append('simplejson')

entry_points={
'console_scripts': [
'buildbot = buildbot.scripts.runner:run'],
Expand Down

0 comments on commit bdb4bd1

Please sign in to comment.