packaging some lantorrent deps with cumulus (same virutal env). expan…

…ding

the range of acceptable simplejson packages

cumulus/reqs.txt

@@ -3,3 +3,5 @@ deps/pyOpenSSL-0.10.tar.gz
 deps/zope.interface-3.6.1.tar.gz
 deps/Twisted-10.0.0.tar.bz2
 deps/nose-0.11.3.tar.gz
+deps/simplejson-2.1.6.tar.gz
+deps/SQLAlchemy-0.6.8.tar.gz

install

@@ -117,6 +117,7 @@ fi
 export NIMBUS_HOME
 source $pyve_path/bin/activate
 export LANTORRENT_HOME=$NIMBUS_HOME/lantorrent
+
 $NIMBUS_SRC/lantorrent/install.sh $LANTORRENT_HOME | tee -a $NIMBUS_HOME/install.log
 rc=$PIPESTATUS
 if [ $rc -ne 0 ]; then

lantorrent/setup-vmm.py

@@ -31,7 +31,7 @@
 Fast multicast of large files (designed for VM images)
 """,
       license="Apache2",
-      install_requires = ["simplejson == 2.1"],
+      install_requires = ["simplejson <= 2.1, >= 1.9"],
 
       include_package_data = True,
 #      data_files = test_plans,
@@ -98,4 +98,4 @@
         line = line.replace(old, new)
     sys.stdout.write(line)
 
-print "=============== END WITH THE PREVIOUS LINE ================="
+print "=============== END WITH THE PREVIOUS LINE ================="

lantorrent/setup.py

@@ -34,7 +34,7 @@
 Fast multicast of large files (designed for VM images)
 """,
       license="Apache2",
-      install_requires = ["simplejson == 2.1", "sqlalchemy == 0.6"],
+      install_requires = ["simplejson <= 2.1, >= 1.9", "sqlalchemy == 0.6"],
 
       include_package_data = True,
 #      data_files = test_plans,
@@ -77,4 +77,4 @@
     raise Exception('Failed to copy the config file %s' % (cp_cmd))
 
 
-print "Lantorrent is now installed into your python environment.  We recommend using the LANTORRENT_HOME environment variable to specify the location of configuration and log files.  If this env is not set then ~/.lantorrent is used."
+print "Lantorrent is now installed into your python environment.  We recommend using the LANTORRENT_HOME environment variable to specify the location of configuration and log files.  If this env is not set then ~/.lantorrent is used."