diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9f8e606c..119d6af8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -82,7 +82,6 @@ jobs: eval $(perl -I ${{ env.PERL_CACHE }}/lib/perl5/ -Mlocal::lib) cpanm --quiet --notest Module::Build - cpanm --quiet --notest Alien::Tidyp ./scripts/install_wsi_dependencies.sh "$NPG_LIB" \ perl-dnap-utilities \ diff --git a/Build.PL b/Build.PL index 2a9b5f6a..13eb876d 100644 --- a/Build.PL +++ b/Build.PL @@ -158,7 +158,6 @@ my $builder = $class->new( 'GD::Text' => 0, 'Getopt::Long' => '2.37', 'HTML::PullParser' => '3.57', - 'HTML::Tidy' => 0, 'HTTP::Request' => '5.818', 'HTTP::Request::Common' => '5.822', 'HTTP::Response' => 0, diff --git a/Changes b/Changes index 13e8294f..41eb9d41 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ LIST OF CHANGES +release 101.1.1 + - remove dependency on HTML::Tidy + - update NovaSeqX icon + release 101.1.0 - Deleted npg_tracking::illumina::run::short_info and npg_tracking::illumina::run::locations, their functionality is moved to diff --git a/MANIFEST b/MANIFEST index 433b1834..609c6d63 100644 --- a/MANIFEST +++ b/MANIFEST @@ -188,7 +188,6 @@ lib/npg/view/user.pm lib/npg/view/user2usergroup.pm lib/npg/view/usergroup.pm lib/npg_testing/db.pm -lib/npg_testing/html.pm lib/npg_tracking/daemon.pm lib/npg_tracking/data/bait.pm lib/npg_tracking/data/bait/find.pm @@ -327,7 +326,6 @@ t/10-model-user_usergroup.t t/10-model-usergroup.t t/10-model.t t/10-npg_testing-db.t -t/10-npg_testing-html.t t/10-npg_tracking-glossary-composition-component-illumina.t t/10-npg_tracking-glossary-composition-component.t t/10-npg_tracking-glossary-composition-factory-attributes.t diff --git a/data/gfx/NovaSeqX.png b/data/gfx/NovaSeqX.png index 994768ab..932cef31 100644 Binary files a/data/gfx/NovaSeqX.png and b/data/gfx/NovaSeqX.png differ diff --git a/lib/npg_testing/html.pm b/lib/npg_testing/html.pm deleted file mode 100644 index bc5c5577..00000000 --- a/lib/npg_testing/html.pm +++ /dev/null @@ -1,111 +0,0 @@ -package npg_testing::html; - -use strict; -use warnings; -use Carp; -use English qw{-no_match_vars}; -use Exporter; -use HTML::Tidy; - -our $VERSION = '0'; - -=head1 NAME - -npg_testing::html - -=head1 VERSION - -=head1 SYNOPSIS - -=head1 DESCRIPTION - -A collection of test routines for html - -=head1 SUBROUTINES/METHODS - -=cut - - -## no critic (ProhibitExplicitISA) -our @ISA = qw(Exporter); -our @EXPORT_OK = qw(html_tidy_ok); - -=head2 html_tidy_ok - -Test utilising HTML::Tidy - -=cut -sub html_tidy_ok { - my $html_string = shift; - my $tidy = HTML::Tidy->new( {} ); - my $is_tidy = 1; - $tidy->parse(q[], $html_string); - if (scalar $tidy->messages() > 0) { - $is_tidy = 0; - carp (join qq[\n], q[HTML::Tidy messages:], $tidy->messages()); - ## no critic (ProhibitStringySplit) - my @lines = split qq[\n], $html_string; - ## use critic - my $count = 0; - my @counted_lines = (); - foreach my $line (@lines) { $count++; push @counted_lines, "$count: $line"; } - carp (join qq[\n], @counted_lines); - } - $tidy->clear_messages(); - return $is_tidy; -} - -1; -__END__ - -=head1 DIAGNOSTICS - -=head1 CONFIGURATION AND ENVIRONMENT - -=head1 DEPENDENCIES - -=over - -=item warnings - -=item strict - -=item Carp - -=item English - -=item Exporter - -=item HTML::Tidy - -=back - -=head1 INCOMPATIBILITIES - -=head1 BUGS AND LIMITATIONS - -=head1 AUTHOR - -Marina Gourtovaia Emg8@sanger.ac.ukE - -=head1 LICENSE AND COPYRIGHT - -Copyright (C) 2010 GRL, by Marina Gourtovaia - -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 . - -=cut - diff --git a/t/10-npg_testing-html.t b/t/10-npg_testing-html.t deleted file mode 100644 index 0f83c924..00000000 --- a/t/10-npg_testing-html.t +++ /dev/null @@ -1,9 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; - -my @subs = qw(html_tidy_ok); -use_ok( 'npg_testing::html', @subs); -can_ok(__PACKAGE__, 'html_tidy_ok'); - -1; \ No newline at end of file