-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update: Concatenation Service (#298)
* Updated attachments concatenation service to work with 'fq' files and updated naming of concatenated paired end files * Pushing up method name change missed in prev commit * Updated regex matching for nonzipped_file_extension method, updated tests to check that the concatenated file names match the expected file names * Added tests for concatenating fq and fq.gz files * Updated validate_file_extensions method to validate_file_formats which just checks to see if the compression and formats are the same before concatenating, Reverted change which added nonzipped_file_extension to attachment model and added the appropriate extension to the concatenated files. Updated tests
- Loading branch information
1 parent
cdebe29
commit 0d5b6b1
Showing
11 changed files
with
255 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
@gi|284993440|ref|NC_013768.1|-540/1 | ||
CTGTGGCGGGGACAATTATGATTGGTTTACTTACAGTGTCGCTTTTAATCGGTGTAATTTGGGCGCCGAAAACACGTGGCAGATCACTTGATGATATTACGAAGGAACGTTACGGAAATACAATTGATTAAAGAAAAGGAGCCAGACCAGTGAAACATTATGTTGCAGTAGATATTGGTGCATCAAGTGGTCGATTAATTCTAGGGAAATTGGTGAATGAAAAATTACAATTAGAAGAAATTCACCGTTT | ||
+ | ||
[email protected]>IGHHFFHII=IIBIIFIAHFIIHFFAAC@HDIIIH*IIIHIIHIIHCIHHIHHHHHHHHHEIGIHHIHHHCHHHGHHGFFEFHGHFFE+DGD>AAG6;CG*EEGGGFGFGEGE4ECEGEE1?G?DGGEG*:GEEGDE:?GGEEEEGFGGGDG6GGEGGFEGGC6:GEEHE:HGECDEG?:GEGGDG:GEGE?EEAEEEGC/GAGEEAG | ||
@gi|284993440|ref|NC_013768.1|-538/1 | ||
CGAAAACACGTGGCAGATCACTTGATGATATTACGAAGGAACGTTACGGAAATACAATTGATTAAAGAAAAGGAGGTAGACCAGTGAAACATTATGTTGCAGTAGATATTGGTGCATCAAGTGGTCGATTAATTCTAGGGAAATTGGTGAATGAAAAATTACAATTAGAAGAAATTCACCGTTTTAAAAATGGTTTTACGTACCGAGATGGACACGAACGCTGGGAAATTGATCAACTAATGCAGGAAAT | ||
+ | ||
??A??BBBDD.DDDDBFGFFFGIIHIIIFEFII0EFIHI0EIH0HHGIFI@HHIHIHFHIHIIEIIGHHIHHIIH+HIIIHIG8HIIG?HEHGIHCIIHHIDBHIHHGHE@FIFFHEEHEH=G;9EC(CGF*GFFGE:DGEE@EGEGGGG@EGGEG8GGCEECCGG6AGE*;FAEDFC?C0CFG0GG;FGEG6E<GC?:0E<?*CECGGE,HHFGHFEG??80AF??GCCGGE*GGE0ECEE/:<GGG?E | ||
@gi|284993440|ref|NC_013768.1|-536/1 | ||
TATACTCGTTAGCCATTCTAGGCTGATTTGTTGGTCACGAAAAAGGATGTTGATGAGAATGTCCTTTTCGCCTGTTGCTTTTATGGAATGATGGCAGCCGCTGTCTAAAAGTAAAAGTTCTCCTTCATGTAAAGTTTCTTTATTTGCTTCAATGATTTGTTCAGAGCTTCCTGAATACATGTAATTTAGTTCAAGAAATTGATGCGTATGGTATGGGTAGTCGGCAATTCGGTTGTGTTTGCTTATATAA | ||
+ | ||
?<AAABBBBDBD<BDDFEG>FFHII>FIHIGIIFIHEH/HGF,HHHIHIHHDD/II?CIHIACHFI5HG=IHGIIHHIFDHIFHIDGIFCFIEGHHCHHGHHHHCHFGGHHHFHEEHGB?GF.GGF=GGG@DDHGEGCG;GDG=*)EGFEG*GGGEEGBAGEEGDC;GEGG86G?8GEGCGGCFGGGCG?EEEG:GGAFCGED*CE:0G,CHHECHEC,CEEEG:FE(G*AGEEGGGGGGG<EGGGF?:F | ||
@gi|284993440|ref|NC_013768.1|-534/1 | ||
TAATCCGTCTACTTATCATGCCTTTAATGATCAAACAGCTGAAAAGCCAAAAGGCCATGACAAACTTACAACCGAAAATCAAAGAACTACAAGAAAAATACTCGTCTAAAGATAATGAAACAATACCAAAACTACAACAAGAAACAATGCGTCTATATCAAGAAAATAGCGTAAATCCAATGATGGGTTGTTTACCATTATTAATCCAAATGCCTATTCTACTAGGATTTTACCAAGCGATTAGTAGAAC | ||
+ | ||
??5?ABBBDDD@[email protected]@HFGHFHI?EAFHEIHFIHIGDFBIIII?HHCIIHHIIE/DFEHGI5HHHFHHGIHGHGGD)G8H,FG+GGCGHGCGGGFEHE?EEGGADFED;EG?GG?EEE8EGCCFGGGG?GEFGEGGGG;GC6GGG8AAECFCEGGEEGCGFGACGG?HHCHGEFG6G2A'CGAGEG:/FEG?1GE0GFGEGEEA0CC | ||
@gi|284993440|ref|NC_013768.1|-532/1 | ||
TTTCTTAGTGGGTGTGTACTTATTTTGGAATTTAGTAGCGGGTGCAATGGGATTCTTTATGCCGTTTGTATATGAAACGGTGGGTGGTCTTTCTAATACACAAGCGAATTTATTGCAAGCTGTATTATGGATACTAACAGCAGCTTCTACATACTTTGGCTTTGCTAAATTTGGTGATCGAGTAAGTCATCGTGGGTTGTTTTTTGTAGGGGCTTTAATGGCAGTTGCTTCTTGGGTTGTACTTACTTTT |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
@gi|284993440|ref|NC_013768.1|-540/2 | ||
TCAAAACATAGTCAACGCCCCACGTGTCAATTCCAAGCACACATTCCGAAATCCCCAGTTGCTTTACTTTTTCCAAGCCAATAAAAATTTCCTGCATTAGTTGATCAATTTCCCAGCGTTCGTGTCCATCTCGGTACGAAAAACCATTTTTAAAACGGTGAATTTCTTCTAATTGTAATTTTTCATTCACCAATTTCCCTAGAATTAATCAACCACTTGATGCACCAATATCTACTGCAACATAATGTTT | ||
+ | ||
??A5ABB?D+A-DD@<CFFF.FI>FE/IIFH=IHCHG.II/CIHHBIIHFHHHHH=HHIH5GHI5HHGIFFIHFHFHGEBIIHHFHHCEHHFCFBDCHH+=@HHGG-=*EDHB5GGGEHH2FBDHEF=,B??E.GGFG*FBCEEE82(EGGEE5GEECEEEGGGGEGEEG/G?EAFFDF?CEGGFFA<1(GFGEFE:E:GE?EGG*EEDA(G(GGFE7,G8GE*C?FF*(EE??E?A:*(E/'E*FCG)E | ||
@gi|284993440|ref|NC_013768.1|-538/2 | ||
ATTTAAAGTTCGTTTTTCGCGATAACTAATTGGATCTGCCAACTTCTCACCGGAAGCCCCTATCAAAACATAGTCAACGCCCCACGTGTCAATTCCAAGCACACTTTCCGAAATCCCCAGTTGCTTTACTTTTTTCAAGCCAATAAAAATTTCCTACATTAGCTGGTCAATTTCCCAGCGTTTGTGTCCATCTCGGTGCGTAAAACCATTTTTAAAACGGTGAAGATCTTCTAATTGTAATTGTTCATTC | ||
+ | ||
???A??<B<D<-BD5-CF>GGFFIHHHHCI>AFI>I9EHDHIDIFEIGI-CHHGHDIDHCAIEFHFFHH-IEIACAFAHECIIHFH+EIHH-HHGDBHIHHH2H#DHFFFHGEHEGEEHB@FDGDG(EFH@EGC*GEG@HCGEEFGBGDA;EFEC#:CEFAE*3G.GEG9E=0*GF*2FCCG(/?A0DFE8(::64?.E<</DA8A6:CHEGHE*0.8EGFGG(**6A6GEC(:G6E*A1(8.G(6(/?E | ||
@gi|284993440|ref|NC_013768.1|-536/2 | ||
CAAATTTACAGAAGGAGATTGTGAAATGGAAGCGCTTAATAAAAAATTATTTCGCCTAAATTCAAAAAAAAAAATCCAAAAAAGCACTGGCACTTTTGTTCCCGATTTACCCAATGGATCCTTTTTAAAAGAGAACGGCAGCATGGAAATATTAAATGATTATTTCTTCAAAAACAAAGACATTTATATAAGCAAACACAGCCGATTTGCCGACTACCCATACCATACGCATCAATTTCTTGAACTAAAT | ||
+ | ||
??<,??BBBDDDBD-?F+6CG+FHI6FHEHEI9FIHHHGIIFFEIFFAFGFCGHHFHII+G=HHGH--5FI-HAFHGHIHDA+HIH-HHIH<+FHGIHG*;E2HGFHI@FHFGH5EF<H7+FB+HHFGE#GFDGEGC,GEEEG*DGEG*CG0G99GGFEEFC,(?EGEEE(2<G8EGEEGGCGGE/EEF6(CE0CGE?AA#CC:=EH*:?H:EG*?(EGGGG;A*F:G/E6.*E???6CECAG:?*EAEC | ||
@gi|284993440|ref|NC_013768.1|-534/2 | ||
TGATGTAAACAATCATTGCCAGTGATTTATTTTGCTGTGTTTGCCCCATCATAGAAATTTTTGATGATAAGAATGTTGTAAATGCCGCAACAACCGGTAAGATGTAATATGGATCTGGATTTCCCAGTTGTATCCATAAGAACGAATCTGTTTTGATTTCTGCTGTTCTACTAATCGCTTGGTAAAATCCTAGTATAATAGGCATTTGGATTAATAATGGGAAACAACCCATCATTGGATTTACGCTATT | ||
+ | ||
?????BBBDDDEDEDD6FF@C+IHIFCEHHHEICIHHI/HIHHHHAFHHHHIHHHH@HIHEGICHIHCIIHIGCF-FHH-FFI>BHHEGHIH=IIHHHIHHHG+HH6CHHD+CC?EHHGDFG+GF(EEGE(D,EEGEE3HAD)EE<GD1EFF@FCGGG:E9:G<F?6*F>(GE*C2<AEAG:'6G?#E.6:<?*C(?E**G/(C8CECG/FE@GG=0G(:*:C??(AEECFCEG*G?E:0F.G0(GC/EC | ||
@gi|284993440|ref|NC_013768.1|-532/2 | ||
CACCTGTACTACCACGAACTAAGAAAAACATCACGCCTTGAACCCCACCACGATATTTTCTTGGGAAAAGTTCTGTGGACCAAAGTGCGTAAAAAGCTTGTGCACCAATACCTGCTGAAATAACCCATAAAGTAACAAATGTCCATAAGCCAACACAAGACATCCCACCTAAAGTGATTACAACCCAAGAAGCAACTGCCATTAACGCACCTACAAAAAACAAACCACGATGACTTACTCGATCACCAAG |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
@gi|662858600|ref|NC_013766.2|-540/1 | ||
CTGTGGCGGGGACAATTATGATTGGTTTACTTACAGTGTCGCTTTTAATCGGTGTAATTTGGGCGCCGAAAACACGTGGCAGATCACTTGATGATATTACGAAGGAACGTTACGGAAATACAATTGATTAAAGAAAAGGAGCCAGACCAGTGAAACATTATGTTGCAGTAGATATTGGTGCATCAAGTGGTCGATTAATTCTAGGGAAATTGGTGAATGAAAAATTACAATTAGAAGAAATTCACCGTTT | ||
+ | ||
[email protected]>IGHHFFHII=IIBIIFIAHFIIHFFAAC@HDIIIH*IIIHIIHIIHCIHHIHHHHHHHHHEIGIHHIHHHCHHHGHHGFFEFHGHFFE+DGD>AAG6;CG*EEGGGFGFGEGE4ECEGEE1?G?DGGEG*:GEEGDE:?GGEEEEGFGGGDG6GGEGGFEGGC6:GEEHE:HGECDEG?:GEGGDG:GEGE?EEAEEEGC/GAGEEAG | ||
@gi|662858600|ref|NC_013766.2|-538/1 | ||
CGAAAACACGTGGCAGATCACTTGATGATATTACGAAGGAACGTTACGGAAATACAATTGATTAAAGAAAAGGAGGTAGACCAGTGAAACATTATGTTGCAGTAGATATTGGTGCATCAAGTGGTCGATTAATTCTAGGGAAATTGGTGAATGAAAAATTACAATTAGAAGAAATTCACCGTTTTAAAAATGGTTTTACGTACCGAGATGGACACGAACGCTGGGAAATTGATCAACTAATGCAGGAAAT | ||
+ | ||
??A??BBBDD.DDDDBFGFFFGIIHIIIFEFII0EFIHI0EIH0HHGIFI@HHIHIHFHIHIIEIIGHHIHHIIH+HIIIHIG8HIIG?HEHGIHCIIHHIDBHIHHGHE@FIFFHEEHEH=G;9EC(CGF*GFFGE:DGEE@EGEGGGG@EGGEG8GGCEECCGG6AGE*;FAEDFC?C0CFG0GG;FGEG6E<GC?:0E<?*CECGGE,HHFGHFEG??80AF??GCCGGE*GGE0ECEE/:<GGG?E | ||
@gi|662858600|ref|NC_013766.2|-536/1 | ||
TATACTCGTTAGCCATTCTAGGCTGATTTGTTGGTCACGAAAAAGGATGTTGATGAGAATGTCCTTTTCGCCTGTTGCTTTTATGGAATGATGGCAGCCGCTGTCTAAAAGTAAAAGTTCTCCTTCATGTAAAGTTTCTTTATTTGCTTCAATGATTTGTTCAGAGCTTCCTGAATACATGTAATTTAGTTCAAGAAATTGATGCGTATGGTATGGGTAGTCGGCAATTCGGTTGTGTTTGCTTATATAA | ||
+ | ||
?<AAABBBBDBD<BDDFEG>FFHII>FIHIGIIFIHEH/HGF,HHHIHIHHDD/II?CIHIACHFI5HG=IHGIIHHIFDHIFHIDGIFCFIEGHHCHHGHHHHCHFGGHHHFHEEHGB?GF.GGF=GGG@DDHGEGCG;GDG=*)EGFEG*GGGEEGBAGEEGDC;GEGG86G?8GEGCGGCFGGGCG?EEEG:GGAFCGED*CE:0G,CHHECHEC,CEEEG:FE(G*AGEEGGGGGGG<EGGGF?:F | ||
@gi|662858600|ref|NC_013766.2|-534/1 | ||
TAATCCGTCTACTTATCATGCCTTTAATGATCAAACAGCTGAAAAGCCAAAAGGCCATGACAAACTTACAACCGAAAATCAAAGAACTACAAGAAAAATACTCGTCTAAAGATAATGAAACAATACCAAAACTACAACAAGAAACAATGCGTCTATATCAAGAAAATAGCGTAAATCCAATGATGGGTTGTTTACCATTATTAATCCAAATGCCTATTCTACTAGGATTTTACCAAGCGATTAGTAGAAC | ||
+ | ||
??5?ABBBDDD@[email protected]@HFGHFHI?EAFHEIHFIHIGDFBIIII?HHCIIHHIIE/DFEHGI5HHHFHHGIHGHGGD)G8H,FG+GGCGHGCGGGFEHE?EEGGADFED;EG?GG?EEE8EGCCFGGGG?GEFGEGGGG;GC6GGG8AAECFCEGGEEGCGFGACGG?HHCHGEFG6G2A'CGAGEG:/FEG?1GE0GFGEGEEA0CC | ||
@gi|662858600|ref|NC_013766.2|-532/1 | ||
TTTCTTAGTGGGTGTGTACTTATTTTGGAATTTAGTAGCGGGTGCAATGGGATTCTTTATGCCGTTTGTATATGAAACGGTGGGTGGTCTTTCTAATACACAAGCGAATTTATTGCAAGCTGTATTATGGATACTAACAGCAGCTTCTACATACTTTGGCTTTGCTAAATTTGGTGATCGAGTAAGTCATCGTGGGTTGTTTTTTGTAGGGGCTTTAATGGCAGTTGCTTCTTGGGTTGTACTTACTTTT |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
@gi|662858600|ref|NC_013766.2|-540/2 | ||
TCAAAACATAGTCAACGCCCCACGTGTCAATTCCAAGCACACATTCCGAAATCCCCAGTTGCTTTACTTTTTCCAAGCCAATAAAAATTTCCTGCATTAGTTGATCAATTTCCCAGCGTTCGTGTCCATCTCGGTACGAAAAACCATTTTTAAAACGGTGAATTTCTTCTAATTGTAATTTTTCATTCACCAATTTCCCTAGAATTAATCAACCACTTGATGCACCAATATCTACTGCAACATAATGTTT | ||
+ | ||
??A5ABB?D+A-DD@<CFFF.FI>FE/IIFH=IHCHG.II/CIHHBIIHFHHHHH=HHIH5GHI5HHGIFFIHFHFHGEBIIHHFHHCEHHFCFBDCHH+=@HHGG-=*EDHB5GGGEHH2FBDHEF=,B??E.GGFG*FBCEEE82(EGGEE5GEECEEEGGGGEGEEG/G?EAFFDF?CEGGFFA<1(GFGEFE:E:GE?EGG*EEDA(G(GGFE7,G8GE*C?FF*(EE??E?A:*(E/'E*FCG)E | ||
@gi|662858600|ref|NC_013766.2|-538/2 | ||
ATTTAAAGTTCGTTTTTCGCGATAACTAATTGGATCTGCCAACTTCTCACCGGAAGCCCCTATCAAAACATAGTCAACGCCCCACGTGTCAATTCCAAGCACACTTTCCGAAATCCCCAGTTGCTTTACTTTTTTCAAGCCAATAAAAATTTCCTACATTAGCTGGTCAATTTCCCAGCGTTTGTGTCCATCTCGGTGCGTAAAACCATTTTTAAAACGGTGAAGATCTTCTAATTGTAATTGTTCATTC | ||
+ | ||
???A??<B<D<-BD5-CF>GGFFIHHHHCI>AFI>I9EHDHIDIFEIGI-CHHGHDIDHCAIEFHFFHH-IEIACAFAHECIIHFH+EIHH-HHGDBHIHHH2H#DHFFFHGEHEGEEHB@FDGDG(EFH@EGC*GEG@HCGEEFGBGDA;EFEC#:CEFAE*3G.GEG9E=0*GF*2FCCG(/?A0DFE8(::64?.E<</DA8A6:CHEGHE*0.8EGFGG(**6A6GEC(:G6E*A1(8.G(6(/?E | ||
@gi|662858600|ref|NC_013766.2|-536/2 | ||
CAAATTTACAGAAGGAGATTGTGAAATGGAAGCGCTTAATAAAAAATTATTTCGCCTAAATTCAAAAAAAAAAATCCAAAAAAGCACTGGCACTTTTGTTCCCGATTTACCCAATGGATCCTTTTTAAAAGAGAACGGCAGCATGGAAATATTAAATGATTATTTCTTCAAAAACAAAGACATTTATATAAGCAAACACAGCCGATTTGCCGACTACCCATACCATACGCATCAATTTCTTGAACTAAAT | ||
+ | ||
??<,??BBBDDDBD-?F+6CG+FHI6FHEHEI9FIHHHGIIFFEIFFAFGFCGHHFHII+G=HHGH--5FI-HAFHGHIHDA+HIH-HHIH<+FHGIHG*;E2HGFHI@FHFGH5EF<H7+FB+HHFGE#GFDGEGC,GEEEG*DGEG*CG0G99GGFEEFC,(?EGEEE(2<G8EGEEGGCGGE/EEF6(CE0CGE?AA#CC:=EH*:?H:EG*?(EGGGG;A*F:G/E6.*E???6CECAG:?*EAEC | ||
@gi|662858600|ref|NC_013766.2|-534/2 | ||
TGATGTAAACAATCATTGCCAGTGATTTATTTTGCTGTGTTTGCCCCATCATAGAAATTTTTGATGATAAGAATGTTGTAAATGCCGCAACAACCGGTAAGATGTAATATGGATCTGGATTTCCCAGTTGTATCCATAAGAACGAATCTGTTTTGATTTCTGCTGTTCTACTAATCGCTTGGTAAAATCCTAGTATAATAGGCATTTGGATTAATAATGGGAAACAACCCATCATTGGATTTACGCTATT | ||
+ | ||
?????BBBDDDEDEDD6FF@C+IHIFCEHHHEICIHHI/HIHHHHAFHHHHIHHHH@HIHEGICHIHCIIHIGCF-FHH-FFI>BHHEGHIH=IIHHHIHHHG+HH6CHHD+CC?EHHGDFG+GF(EEGE(D,EEGEE3HAD)EE<GD1EFF@FCGGG:E9:G<F?6*F>(GE*C2<AEAG:'6G?#E.6:<?*C(?E**G/(C8CECG/FE@GG=0G(:*:C??(AEECFCEG*G?E:0F.G0(GC/EC | ||
@gi|662858600|ref|NC_013766.2|-532/2 | ||
CACCTGTACTACCACGAACTAAGAAAAACATCACGCCTTGAACCCCACCACGATATTTTCTTGGGAAAAGTTCTGTGGACCAAAGTGCGTAAAAAGCTTGTGCACCAATACCTGCTGAAATAACCCATAAAGTAACAAATGTCCATAAGCCAACACAAGACATCCCACCTAAAGTGATTACAACCCAAGAAGCAACTGCCATTAACGCACCTACAAAAAACAAACCACGATGACTTACTCGATCACCAAG |
Oops, something went wrong.