Added condition requirement to simplejson
simplejson is a part of python 2.6. Change-Id: I3a1d776918c8707f21532fe3b043a039b72d6704 Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
1
AUTHORS
1
AUTHORS
@@ -4,3 +4,4 @@ Monty Taylor <mordred@inaugust.com>
|
|||||||
Dean Troyer <dtroyer@gmail.com>
|
Dean Troyer <dtroyer@gmail.com>
|
||||||
Gabriel Hurley <gabriel@strikeawe.com>
|
Gabriel Hurley <gabriel@strikeawe.com>
|
||||||
James E. Blair <jeblair@hp.com>
|
James E. Blair <jeblair@hp.com>
|
||||||
|
Chuck Short <chuck.short@canonical.com>
|
||||||
|
4
setup.py
4
setup.py
@@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
@@ -11,6 +12,9 @@ requires = parse_requirements()
|
|||||||
dependency_links = parse_dependency_links()
|
dependency_links = parse_dependency_links()
|
||||||
write_git_changelog()
|
write_git_changelog()
|
||||||
|
|
||||||
|
if sys.version_info < (2, 6):
|
||||||
|
requires.append('simplejson')
|
||||||
|
|
||||||
|
|
||||||
def read(fname):
|
def read(fname):
|
||||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
argparse
|
argparse
|
||||||
httplib2
|
httplib2
|
||||||
prettytable
|
prettytable
|
||||||
simplejson
|
|
||||||
|
|
||||||
-e git://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
|
-e git://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
|
||||||
|
Reference in New Issue
Block a user