summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornitromaster101 <nitromaster101@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-06-24 21:11:01 +0000
committernitromaster101 <nitromaster101@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-06-24 21:11:01 +0000
commit3906b65c2e2fe902b7cc74f13c8dc5ec2b531895 (patch)
tree0d79dcb3e0ed3dec2c629584225b2bb7cde63ffa
parent65f98eb264a18c1e596fe19de009ff59ddc01f14 (diff)
prepare for 0.5 release
git-svn-id: http://freebase-python.googlecode.com/svn/trunk@124 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2
-rw-r--r--setup.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index fe0b3b1..eb1b2b7 100644
--- a/setup.py
+++ b/setup.py
@@ -27,14 +27,26 @@
# POSSIBILITY OF SUCH DAMAGE.
# ========================================================================
+import sys
+
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
+
+# if python version < 2.6, require simplejson
+# if python version >= 2.6, it comes with json
+
+json = []
+
+major, minor, micro, releaselevel, serial = sys.version_info
+if major <= 2 and minor < 6:
+ json.append("simplejson")
+
setup(
name='freebase',
- version='0.4',
+ version='0.5',
author='Nick Thompson',
author_email='nix@metaweb.com',
maintainer_email='developers@freebase.com',
@@ -50,9 +62,7 @@ setup(
'fcl = freebase.fcl.fcl:main'
]
},
- install_requires=[
- "simplejson",
- ],
+ install_requires=[] + json,
#download_url='xxx', # provided by cheeseshop?
classifiers=[
'Development Status :: 3 - Alpha',