avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1129856 - in /avro/trunk: CHANGES.txt lang/py/setup.py
Date Tue, 31 May 2011 19:06:11 GMT
Author: philz
Date: Tue May 31 19:06:11 2011
New Revision: 1129856

URL: http://svn.apache.org/viewvc?rev=1129856&view=rev
Log:
AVRO-833. Don't require simplejson for python >= 2.6.

Contributed by Miki Tebeka.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/py/setup.py

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1129856&r1=1129855&r2=1129856&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue May 31 19:06:11 2011
@@ -8,6 +8,9 @@ Avro 1.6.0 (unreleased)
 
   IMPROVEMENTS
 
+    AVRO-833. Don't require simplejson for python >= 2.6.
+    (Miki Tebeka via philz)
+
   BUG FIXES
     
     AVRO-815. Java: Netty Transceiver fails processing one-way messages.

Modified: avro/trunk/lang/py/setup.py
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/setup.py?rev=1129856&r1=1129855&r2=1129856&view=diff
==============================================================================
--- avro/trunk/lang/py/setup.py (original)
+++ avro/trunk/lang/py/setup.py Tue May 31 19:06:11 2011
@@ -20,6 +20,12 @@ try:
 except ImportError:
   from distutils.core import setup
 
+from sys import version_info
+if (version_info.major, version_info.minor) > (2, 5):
+    install_requires = []
+else:
+    install_requires = ['simplejson >= 2.0.9']
+
 setup(
   name = 'avro',
   version = '@AVRO_VERSION@',
@@ -28,7 +34,7 @@ setup(
 
   # Project uses simplejson, so ensure that it gets installed or upgraded
   # on the target machine
-  install_requires = ['simplejson >= 2.0.9'],
+  install_requires = install_requires,
 
   # metadata for upload to PyPI
   author = 'Apache Avro',



Mime
View raw message