From e8e5485b118ef6fcf77f7ecfcc09ae2ae6055847 Mon Sep 17 00:00:00 2001 From: Mikael Salson Date: Fri, 20 Feb 2015 19:14:27 +0100 Subject: [PATCH] fuse.py moved from server/ to tools/ --- Makefile | 2 +- algo/tests/fuse-three-files.should_get | 2 +- algo/tests/stanford-fuse.should_get | 2 +- doc/browser.org | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2cb197d30..431d71776 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ unit: all pytests: @echo "*** Launching python tests..." - python server/fuse.py --test x + python tools/fuse.py --test x @echo "*** All python tests passed" should: all diff --git a/algo/tests/fuse-three-files.should_get b/algo/tests/fuse-three-files.should_get index 84b27057d..ced0911b7 100644 --- a/algo/tests/fuse-three-files.should_get +++ b/algo/tests/fuse-three-files.should_get @@ -1,4 +1,4 @@ -!LAUNCH: python ../../server/fuse.py ../../data/results-two-clones.vidjil ../../data/results-two-clones.vidjil ../../data/results-two-clones.vidjil ; cat fused.vidjil +!LAUNCH: python ../../tools/fuse.py ../../data/results-two-clones.vidjil ../../data/results-two-clones.vidjil ../../data/results-two-clones.vidjil ; cat fused.vidjil $ Fuse the three files 2: ListWindows: .1000, 1000, 1000. diff --git a/algo/tests/stanford-fuse.should_get b/algo/tests/stanford-fuse.should_get index c8c81f298..5e0f55617 100644 --- a/algo/tests/stanford-fuse.should_get +++ b/algo/tests/stanford-fuse.should_get @@ -1,4 +1,4 @@ -!LAUNCH: ../../vidjil -G ../../germline/IGH ../../data/Stanford_S22.fasta ; python ../../server/fuse.py out/Stanford_S22.vidjil out/Stanford_S22.vidjil -o out/fused.data ; cat out/fused.data | sh format-json.sh +!LAUNCH: ../../vidjil -G ../../germline/IGH ../../data/Stanford_S22.fasta ; python ../../tools/fuse.py out/Stanford_S22.vidjil out/Stanford_S22.vidjil -o out/fused.data ; cat out/fused.data | sh format-json.sh $ Points list f1:"point": [ "", "" ] diff --git a/doc/browser.org b/doc/browser.org index e919d54bf..47232bf56 100644 --- a/doc/browser.org +++ b/doc/browser.org @@ -30,7 +30,7 @@ database computes these .vidjil files. Otherwise, such .vidjil files can be obtained: - from the command-line version of Vidjil (starting from =.fasta= or =.fastq= files, see [[http://git.vidjil.org/blob/master/doc/algo.org][algo.org]]). - To gather several .vidjil files, you have to use the [[http://git.vidjil.org/blob/master/server/fuse.py][fuse.py]] script + To gather several .vidjil files, you have to use the [[http://git.vidjil.org/blob/master/tools/fuse.py][fuse.py]] script - or by post-processing of other V(D)J analysis pipelines (contact us if you are interested)