Skip to content

Commit

Permalink
Merge pull request #748 from wtsi-npg/devel
Browse files Browse the repository at this point in the history
pull from devel to master to create release 96.0.0
  • Loading branch information
jmtcsngr authored Jul 26, 2023
2 parents 1ca427e + 959eb40 commit 451514c
Show file tree
Hide file tree
Showing 28 changed files with 7,526 additions and 459 deletions.
1 change: 1 addition & 0 deletions Build.PL
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ my $builder = $class->new(
'DBIx::Class' => '0.08119',
'DBIx::Class::Core' => 0,
'DBIx::Class::Schema' => 0,
'DBIx::Class::Schema::Loader' => 0,
'DBIx::Class::InflateColumn::DateTime' => 0,
'Digest::MD5' => 0,
'Digest::SHA' => 0,
Expand Down
12 changes: 12 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
LIST OF CHANGES

release 96.0.0
- Fixed a regression in the npg_move_runfolder script,
which made it unusable.
- Rejig run folder tracking function into method
- Stop using XML LIMS data in a test
- Import samplesheet daemon
- Ensure we have a loader to generate ORM classes
- Flagged planned onboard analysis
- locate_runfolder: simplify, cope with complex globs, link page for multiple
locations
- Allow NovaSeqX samplesheets to embed instrument and slot

release 95.0.0
- Remove singularity recipe and related files
- Import mlwh drivers
Expand Down
10 changes: 10 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ bin/event_notifications
bin/illumina_instruments_uptime
bin/npg_daemon_control
bin/npg_move_runfolder
bin/npg_samplesheet4MiSeq
bin/npg_status_save
bin/staging_area_monitor
bin/npg_deletable_dr_runs
Expand Down Expand Up @@ -164,6 +165,7 @@ lib/npg_tracking/report/event2subscribers.pm
lib/npg_tracking/report/events.pm
lib/npg/samplesheet.pm
lib/npg/samplesheet/novaseq_xseries.pm
lib/npg/samplesheet/auto.pm
lib/npg/util.pm
lib/npg/util/mailer.pm
lib/npg/view.pm
Expand Down Expand Up @@ -404,6 +406,7 @@ t/30-api-util.t
t/34-monitor-runfolder-staging.t
t/34-monitor-runfolder.t
t/34-monitor-staging.t
t/35-monitor_one_runfolder.t
t/40-st-base.t
t/40-st-batch.t
t/40-st-lims-insert_size.t
Expand All @@ -417,6 +420,7 @@ t/40-st-study.t
t/45-st-api-lims-traversal.t
t/47-samplesheet.t
t/47-npg_samplesheet_novaseq_xseries.t
t/47-npg_samplesheet_auto.t
t/50-controller.t
t/50-decorator.t
t/60-illumina-runfolder.t
Expand Down Expand Up @@ -481,6 +485,9 @@ t/data/fixtures/400-run_status.yml
t/data/fixtures/400-tag_run.yml
t/data/fixtures/400-tag_run_lane.yml
t/data/fixtures/500-st_cache.yml
t/data/fixtures_lims_transcriptome/000-Sample.yml
t/data/fixtures_lims_transcriptome/000-Study.yml
t/data/fixtures_lims_transcriptome/100-IseqFlowcell.yml
t/data/fixtures_lims_wh/00-IseqRunStatusDict.yml
t/data/fixtures_lims_wh/000-Sample.yml
t/data/fixtures_lims_wh/000-Study.yml
Expand Down Expand Up @@ -723,6 +730,7 @@ t/data/run_params/RunParameters.novaseq.xml
t/data/run_params/RunParameters.novaseq.xp.xml
t/data/run_params/RunParameters.novaseq.xp.v1.5.xml
t/data/run_params/RunParameters.novaseqx.xml
t/data/run_params/RunParameters.novaseqx.onboard.xml
t/data/run_params/runParameters.hiseq.rr.single.xml
t/data/run_params/runParameters.hiseq.rr.twoind.xml
t/data/run_params/runParameters.hiseq.rr.xml
Expand Down Expand Up @@ -1339,6 +1347,8 @@ t/data/test45/st/studies/297.xml
t/data/test45/st/studies/333.xml
t/data/test45/st/studies/365.xml
t/data/test45/st/studies/700.xml
t/data/test_staging_daemon/novaseqxplus/RunInfo.xml
t/data/test_staging_daemon/novaseqxplus/RunParameters.xml
t/data/gaii/staging/IL12/incoming/100721_IL12_05222/Data/Intensities/L001/.gitignore
t/data/gaii/staging/IL3/incoming/100622_IL3_01234/Data/Intensities/L001/C1.1/.gitignore
t/data/gaii/staging/IL3/incoming/100622_IL3_01234/Data/Intensities/L001/C10.1/.gitignore
Expand Down
61 changes: 43 additions & 18 deletions bin/npg_move_runfolder
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
#!/usr/bin/env perl
#########
# Author: js10
# Created: 2018-05-30
#

use strict;
use warnings;

use FindBin qw($Bin);
use lib ( -d "$Bin/../lib/perl5" ? "$Bin/../lib/perl5" : "$Bin/../lib" );
use Carp;
use autodie qw(:all);
use Getopt::Long;
use Pod::Usage;

use Monitor::Staging;
use Monitor::RunFolder::Staging;

our $VERSION = '0';

use Readonly;
my $help;
my $runfolder_path;
my $status_update = 0;

GetOptions (
'help' => \$help,
'runfolder_path=s' => \$runfolder_path,
'status_update!' => \$status_update,
);
if ($help) { pod2usage(0); }

if (!defined $runfolder_path || $runfolder_path == q[]) {
die "ERROR: --runfolder_path argument is required\n";
}

my @ms = Monitor::RunFolder::Staging->new(
runfolder_path => $runfolder_path,
status_update => $status_update
)->move_to_analysis();

my $mon = Monitor::RunFolder::Staging->new_with_options(status_update => 0);
my @ms = $mon->move_to_analysis();
print join "\n", @ms;

1;
Expand All @@ -30,23 +40,38 @@ __END__
=head1 NAME
npg_move_runfolder - move 'incoming' to 'analysis' and change group.
npg_move_runfolder - move the run folder given as an argument from
'incoming' to 'analysis' and change group.
=head1 VERSION
=head1 SYNOPSIS
C<npg_move_runfolder --runfolder_path path>
C<npg_move_runfolder --runfolder_path path>
=head1 DESCRIPTION
This script moves a given run folder from 'incoming' directory to 'analysis' directory
and changes the group name to that found in the staging configuration.
By default it does not change the run status.
This script moves a given run folder from 'incoming' directory to 'analysis'
directory and changes the group name to that found in the staging
configuration. By default it does not change the run status.
=head1 REQUIRED ARGUMENTS
C<runfolder_path>
=head1 OPTIONS
C<help> - displays help message and exists
C<runfolder_path> - the path of the run folder, required
C<status_update> - a boolean option, defaults to false, meaning that
the run status update is not performed
=head1 CONFIGURATION AND ENVIRONMENT
Depends on the presence of the npg tracking system.
If the run status update is performed, write access to the tracking
database is required.
=head1 INCOMPATIBILITIES
Expand All @@ -58,7 +83,7 @@ Jennifer Liddle, E<lt>[email protected]<gt>
=head1 LICENCE AND COPYRIGHT
Copyright (C) 2018 GRL, by Jennifer Liddle
Copyright (C) 2018, 2023 Genome Research Ltd.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
96 changes: 96 additions & 0 deletions bin/npg_samplesheet4MiSeq
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
#!/usr/bin/env perl

use strict;
use warnings;
use FindBin qw($Bin);
use lib ( -d "$Bin/../lib/perl5" ? "$Bin/../lib/perl5" : "$Bin/../lib" );
use Log::Log4perl qw(:easy);

use npg::samplesheet::auto;

our $VERSION = '0';

Log::Log4perl->easy_init($INFO);

my $log = Log::Log4perl->get_logger('main');
$log->info('Starting npg samplesheet');

npg::samplesheet::auto->new()->loop();

0;

__END__

=head1 NAME

npg_samplesheet4MiSeq

=head1 USAGE

npg_samplesheet4MiSeq

=head1 DESCRIPTION

The script, once started, runs in perpetuity, generating Illumina-style
samplesheets for any MiSeq run with status 'run pending'.

=head1 REQUIRED ARGUMENTS

None

=head1 OPTIONS

=head1 DIAGNOSTICS

=head1 CONFIGURATION

=head1 DEPENDENCIES

=over

=item strict

=item warnings

=item FindBin

=item lib

=item Log::Log4perl

=item npg::samplesheet::auto

=back

=head1 EXIT STATUS

Does not exit unless is sent a signal to terminate.

=head1 INCOMPATIBILITIES

=head1 BUGS AND LIMITATIONS

=head1 AUTHOR

Jaime Tovar E<lt>[email protected]<gt>

=head1 LICENSE AND COPYRIGHT

Copyright (C) 2020,2021,2023 GRL.

This file is part of NPG.

NPG is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

=cut
Loading

0 comments on commit 451514c

Please sign in to comment.