# HG changeset patch
# User stemcellcommons
# Date 1397149266 14400
# Node ID ea38ad1cfb62b5d62ecf118d94f9b24279846097
# Parent  a83ceb02d138ff4d722d689f235336cedb62cede
Replace simplejson with json.

diff -r a83ceb02d138 -r ea38ad1cfb62 run_spp.R
--- a/run_spp.R	Tue Oct 15 15:43:49 2013 -0400
+++ b/run_spp.R	Thu Apr 10 13:01:06 2014 -0400
@@ -120,7 +120,7 @@
 	sep.peak <- NA # user-defined peak shift
 	exclude.min <- 10 # lowerbound of strand shift exclusion region
 	exclude.max <- NaN # upperbound of strand shift exclusion region
-	n.nodes <- NA # number of parallel processing nodes
+	n.nodes <- 32 # number of parallel processing nodes
 	fdr <- 0.01 # false discovery rate threshold for peak calling
 	npeak <- NA # threshold on number of peaks to call
 	temp.dir <- tempdir() # temporary directory
diff -r a83ceb02d138 -r ea38ad1cfb62 spp_wrapper.py
--- a/spp_wrapper.py	Tue Oct 15 15:43:49 2013 -0400
+++ b/spp_wrapper.py	Thu Apr 10 13:01:06 2014 -0400
@@ -5,14 +5,12 @@
 
 import sys, subprocess, tempfile, shutil, glob, os, os.path, gzip
 from galaxy import eggs
-import pkg_resources
-pkg_resources.require( "simplejson" )
-import simplejson
+import json
 
 CHUNK_SIZE = 1024
 
 def main():
-    options = simplejson.load( open( sys.argv[1] ) )
+    options = json.load( open( sys.argv[1] ) )
     output_narrow_peak = sys.argv[2]
     output_region_peak = sys.argv[3]
     output_peakshift_file = sys.argv[4]
@@ -99,4 +97,4 @@
     os.unlink( stderr_name )
     #os.rmdir( tmp_dir )
 
-if __name__ == "__main__": main()
\ No newline at end of file
+if __name__ == "__main__": main()
diff -r a83ceb02d138 -r ea38ad1cfb62 spp_wrapper.xml
--- a/spp_wrapper.xml	Tue Oct 15 15:43:49 2013 -0400
+++ b/spp_wrapper.xml	Thu Apr 10 13:01:06 2014 -0400
@@ -99,7 +99,7 @@
 
   <configfiles>
     <configfile name="options_file">&lt;%
-import simplejson
+import json
 %&gt;
 #set $__options ={ 'experiment_name':str($experiment_name), 'chip_file':str($major_command.input_chipseq_file1) }
 
@@ -165,7 +165,7 @@
         #set $__options['savp'] = str( $major_command.save_plot_file ) 
 #end if
 
-${ simplejson.dumps( __options ) }
+${ json.dumps( __options ) }
     </configfile>
   </configfiles>
   <tests>