Skip to content

Commit

Permalink
fuse.py moved from server/ to tools/
Browse files Browse the repository at this point in the history
  • Loading branch information
mikael-s committed Feb 20, 2015
1 parent e9b7324 commit e8e5485
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion algo/tests/fuse-three-files.should_get
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion algo/tests/stanford-fuse.should_get
Original file line number Diff line number Diff line change
@@ -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": [ "", "" ]
Expand Down
2 changes: 1 addition & 1 deletion doc/browser.org
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit e8e5485

Please sign in to comment.