Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 51.10 prep #226

Merged
merged 51 commits into from
Jun 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
aea45ef
update sequencescape warehouse loader job
mgcam Jan 23, 2017
1d7c46f
initial code deletion
mgcam Apr 26, 2017
a58d062
further code deletions and fixes to tests
mgcam May 11, 2017
bd8f809
tests simplification
mgcam May 11, 2017
1a91fcd
redirect stderr output to a log
mgcam May 15, 2017
204180b
fix job id propagation
mgcam May 17, 2017
09d39d7
fixed bug in computing a path
mgcam May 18, 2017
591b8aa
remove gclp-specific code and conf. files
mgcam May 18, 2017
1559509
deleted illumina2bam function
mgcam May 18, 2017
7a35555
ensure that error in the pipeline can be captured in the pipeline dae…
mgcam May 19, 2017
1b32f63
Merge pull request #218 from mgcam/stderr2log4perl_log
May 23, 2017
bba2b8e
merged in wtsi/devel and resolved conflict in Changes file
mgcam May 24, 2017
4916766
merged in wtsi/devel and resolved conflict in Changes file
mgcam May 24, 2017
3223aaa
merged in wtsi/devel and resolved conflict in Changes file
mgcam May 24, 2017
d3ce9da
Merge remote-tracking branch 'wtsi/devel' into lims_sources4whloader
mgcam May 24, 2017
395fb2a
update sequencescape warehouse loader job
mgcam Jan 23, 2017
cc63c83
Merge commit 'refs/pull/208/head' of https://github.com/wtsi-npg/npg_…
dkj May 25, 2017
b93f038
warn rather than croak in seq_alignemnt if multiple references for tag 0
srl147 Jun 5, 2017
a9521d0
allow p4 stage 1 to analyse runs with different length reads
srl147 Jun 5, 2017
ff1b9d5
Chain execution of RNA-SeQC qc check to the vtfp/viv alignment cmd
Dec 15, 2016
243d5d2
Remove use of attribute qc_report_dir for rna_seqc check
Jan 9, 2017
4337198
Fix bug - value of qc_in arg passed to rna_seqc is wrong in seq_align…
Jan 10, 2017
4e858e1
Remove code that creates the BAM_basecalls_XX-XX/archive/qc/rna_seqc …
Jan 11, 2017
fd7be64
Update seq_alignment tests to reflect latest changes
Jan 11, 2017
622ca7c
tests with multiple references
mgcam Jun 5, 2017
e0d1233
Update changelog and tidy up code
Jun 5, 2017
0271e88
Merge pull request #4 from mgcam/multiple_refs_in_alignment
srl147 Jun 5, 2017
5502b4f
Merge pull request #223 from srl147/multiple_references
mgcam Jun 5, 2017
81ce476
merged in wtsi/devel
mgcam Jun 5, 2017
14edf1a
new merge for wtsi/devel and conflict resolution
mgcam Jun 5, 2017
a00769a
merged in wtsi/devel and resolved conflict in Changes
mgcam Jun 5, 2017
1ccf4de
merged in wtsi/devel and resolved conflict in Changes
mgcam Jun 5, 2017
cccfb34
Merge remote-tracking branch 'wtsi-ngp/devel' into different_length_r…
srl147 Jun 6, 2017
924fe71
Merge pull request #224 from srl147/different_length_reads
mgcam Jun 6, 2017
e0492f4
Merge remote-tracking branch 'wtsi/devel' into less_olb
mgcam Jun 6, 2017
2d4a62c
Merge pull request #217 from mgcam/less_olb
srl147 Jun 6, 2017
54d1296
Merge remote-tracking branch 'wtsi/devel' into drop_gclp
mgcam Jun 6, 2017
a6dcbd7
Merge branch 'drop_il2b' of https://github.com/mgcam/npg_seq_pipeline…
dozy Jun 7, 2017
a4d3506
Merge branch 'mgcam-drop_il2b' into devel
dozy Jun 7, 2017
3e5ec7b
Merge remote-tracking branch 'wtsi/devel' into drop_gclp
mgcam Jun 7, 2017
ddb515d
removed unused force_p4 attribute from npg_pipeline/base.pm
dozy Jun 7, 2017
0df06f9
update Changes
dozy Jun 8, 2017
bfa9fb9
Merge pull request #4 from dozy/drop_gclp
mgcam Jun 8, 2017
a0867b7
Merge pull request #219 from mgcam/drop_gclp
dozy Jun 8, 2017
2049e9c
update p4 stage 2 (seq_alignment) to use bambi chrsplit instead of Sp…
dozy Jun 8, 2017
a00c3c5
update Changes
dozy Jun 8, 2017
654c361
Tiny change: remove unused variable
Jun 8, 2017
e645566
extend list of names for chromosome Y for y-split to cover all varian…
dozy Jun 8, 2017
ade8b28
Merge branch 'devel' into rb11_rna_seqc_from_seq_alignment
Jun 8, 2017
24e5163
Merge pull request #225 from dozy/ysplit_fixes
jenniferliddle Jun 8, 2017
fc2ad1e
Merge commit 'refs/pull/206/head' of https://github.com/wtsi-npg/npg_…
dkj Jun 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
LIST OF CHANGES
---------------

- Chained execution of RNA-SeQC to the vtfp/viv alignment cmd for RNA-Seq libraries only:
entries for qc check rna_seqc removed from central function and parallelisation.
code that created rna_seqc-specific directories has been removed as this is
now handled by the check itself using qc_out arg.
- remove GCLP-specific code and configuration files
- remove unused force_p4 attribute
- OLB analysis removed
- recalibration removed
- pb_cal_path and dif_files_path accessors disabled
- allow p4 stage 1 to analyse runs with different length reads
- illumina2bam function removed
- update p4 stage 2 (seq_alignment) warn rather than croak if multiple references for tag 0
- update p4 stage 2 (seq_alignment) to use bambi chrsplit instead of SplitBamByChromosomes.jar for Y-split runs
- pipeline scripts - redirect stderr output to the log to capture output from all
NPG and CPAN modules in one place

release 51.9
- p4stage2 speed-up by caching references
- p4stage2 errors in getting a reference made fatal
Expand All @@ -20,6 +36,9 @@ release 51.8
release 51.7
- replaces the original log role with the one from DNAP utilities,
which provides a Log4perl logger and some convenience methods.
- new signature for the sequencescape warehouse loader so that it uses
samplsheet LIMs driver at the analysis stage and ml_warehouse_fc_cache
LIMs driver at the archival stage

release 51.6
- test and code fixes to ensure problem-free tests under Perl 5.22.2
Expand Down
15 changes: 2 additions & 13 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,16 @@ bin/script_must_be_unique_runner
Build.PL
Changes
data/config_files/function_list_central.yml
data/config_files/function_list_central_gclp.yml
data/config_files/function_list_central_olb.yml
data/config_files/function_list_central_qc_run.yml
data/config_files/function_list_post_qc_review.yml
data/config_files/function_list_post_qc_review_gclp.yml
data/config_files/general_values.ini
data/config_files/illumina_pipeline.ini
data/config_files/parallelisation.yml
data/config_files/pb_cal_pipeline.ini
lib/npg_pipeline/analysis/bustard4pbcb.pm
lib/npg_pipeline/analysis/create_lane_tag_file.pm
lib/npg_pipeline/analysis/FixConfigFiles.pm
lib/npg_pipeline/analysis/harold_calibration_bam.pm
lib/npg_pipeline/analysis/illumina_basecall_stats.pm
lib/npg_pipeline/analysis/split_bam_by_tag.pm
lib/npg_pipeline/archive/file/BamClusterCounts.pm
lib/npg_pipeline/archive/file/generation.pm
lib/npg_pipeline/archive/file/generation/illumina2bam.pm
lib/npg_pipeline/archive/file/generation/seq_alignment.pm
lib/npg_pipeline/archive/file/qc.pm
lib/npg_pipeline/archive/file/generation/seqchksum_comparator.pm
Expand All @@ -52,7 +45,6 @@ lib/npg_pipeline/pluggable/harold/post_qc_review.pm
lib/npg_pipeline/roles/accessor.pm
lib/npg_pipeline/roles/business/base.pm
lib/npg_pipeline/roles/business/flag_options.pm
lib/npg_pipeline/roles/business/harold_calibration_reqs.pm
lib/npg_pipeline/run/folder/link.pm
lib/npg_tracking/daemon/analysis.pm
lib/npg_tracking/daemon/archival.pm
Expand All @@ -75,18 +67,16 @@ t/15-pipeline_launcher_scripts.t
t/20-archive-fastqcheck.t
t/20-archive_auto_qc_to_db.t
t/20-archive_file-to_irods.t
t/20-archive_file_generation-illumina2bam.t
t/20-archive_file_generation-seq_alignment.t
t/20-archive_folder_generation.t
t/20-archive_illumina_analysis.t
t/20-archive_qc.t
t/20-archive_logs.t
t/21-references_adapters.t
t/25-analysis-bustard4pbcb.t
t/25-analysis-create_lane_tag_file.t
t/25-analysis-FixConfigFiles.t
t/25-analysis-split_bam_by_tag.t
t/25-harold_calibration_bam.t
t/25-analysis-illumina_basecall_stats.t
t/30-launcher-status.t
t/30-run_folder-link.t
t/35-archive_file_generation-BamClusterCounts.t
Expand All @@ -113,7 +103,6 @@ t/bin/software/solexa/jars/Illumina2bam.jar
t/bin/software/solexa/jars/SplitBamByReadGroup.jar
t/bin/software/solexa/bin/qc
t/data/samplesheet_1234.csv
t/data/illumina2bam/1234_samplesheet.csv
t/data/qc/1234_samplesheet_amended.csv
t/data/qc/samplesheet_14353.csv
t/data/qc/samplesheet_14043.csv
Expand Down
1 change: 1 addition & 0 deletions bin/npg_pipeline_central
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Log::Log4perl->easy_init({layout => $layout,
file => $logfile,
utf8 => 1});

$p->redirect_stderr();
$p->main();

0;
Expand Down
1 change: 1 addition & 0 deletions bin/npg_pipeline_post_qc_review
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Log::Log4perl->easy_init({layout => $layout,
file => $logfile,
utf8 => 1});

$p->redirect_stderr();
$p->main();

0;
Expand Down
1 change: 0 additions & 1 deletion data/config_files/function_list_central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
- qc_genotype
- qc_verify_bam_id
- qc_upstream_tags
- qc_rna_seqc
- run_analysis_complete
- update_ml_warehouse
- archive_to_irods_samplesheet
Expand Down
26 changes: 0 additions & 26 deletions data/config_files/function_list_central_gclp.yml

This file was deleted.

36 changes: 0 additions & 36 deletions data/config_files/function_list_central_olb.yml

This file was deleted.

1 change: 0 additions & 1 deletion data/config_files/function_list_central_qc_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- qc_genotype
- qc_verify_bam_id
- qc_upstream_tags
- qc_rna_seqc
- run_analysis_complete
- run_archival_in_progress
- copy_interop_files_to_irods
Expand Down
11 changes: 0 additions & 11 deletions data/config_files/function_list_post_qc_review_gclp.yml

This file was deleted.

7 changes: 0 additions & 7 deletions data/config_files/illumina_pipeline.ini

This file was deleted.

2 changes: 0 additions & 2 deletions data/config_files/parallelisation.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
a:
illumina2bam: 1
illumina_basecall_stats: 1
p4_stage1_analysis: 1
b:
Expand All @@ -19,7 +18,6 @@ c:
qc_genotype: 1
qc_upstream_tags: 1
qc_verify_bam_id: 1
qc_rna_seqc: 1
d:
upload_auto_qc_to_qc_database: 1
upload_fastqcheck_to_qc_database: 1
Expand Down
16 changes: 0 additions & 16 deletions data/config_files/pb_cal_pipeline.ini

This file was deleted.

Loading