Skip to content

Commit 75671c5

Browse files
authored
Merge pull request #1222 from metacpan/haarg/less-prereqs
drop some unneeded prereqs
2 parents ba2b68e + 6a2c163 commit 75671c5

File tree

8 files changed

+24
-37
lines changed

8 files changed

+24
-37
lines changed

cpanfile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ requires 'CatalystX::Fastly::Role::Response', '0.06';
2323
requires 'CatalystX::InjectComponent';
2424
requires 'CatalystX::RoleApplicator';
2525
requires 'CHI', '0.61';
26-
requires 'Config::Any', '0.32';
2726
requires 'Config::General', '2.63';
2827
requires 'Config::ZOMG', '1.000000';
2928
requires 'Const::Fast';
@@ -35,18 +34,14 @@ requires 'CPAN::Meta::YAML', '0.018';
3534
requires 'CPAN::Repository::Perms';
3635
requires 'Cwd';
3736
requires 'Data::DPath';
38-
requires 'Data::Dump';
3937
requires 'Data::Dumper';
40-
requires 'Data::Printer', '1.000004';
4138
requires 'DateTime', '1.54';
4239
requires 'DateTime::Format::ISO8601';
4340
requires 'DBD::SQLite', '1.66';
4441
requires 'DBI', '1.643';
45-
requires 'Devel::ArgNames';
4642
requires 'Digest::MD5';
4743
requires 'Digest::SHA';
4844
requires 'ElasticSearchX::Model', '2.0.1';
49-
requires 'Email::Address';
5045
requires 'Email::Sender::Simple';
5146
requires 'Email::Simple';
5247
requires 'Email::Valid', '1.203';
@@ -73,17 +68,13 @@ requires 'Git::Helpers', '1.000001';
7368
requires 'Gravatar::URL';
7469
requires 'Hash::Merge::Simple';
7570
requires 'HTML::Entities';
76-
requires 'HTML::TokeParser::Simple';
7771
requires 'HTTP::Request::Common', '6.36';
78-
requires 'IO::All';
7972
requires 'IO::Interactive';
8073
requires 'IO::Prompt';
81-
requires 'IO::String';
8274
requires 'IO::Uncompress::Bunzip2', '2.106';
8375
requires 'IO::Zlib';
8476
requires 'IPC::Run3', '0.048';
8577
requires 'JSON::MaybeXS', '1.004004'; # indirect dep
86-
requires 'List::AllUtils', '0.09';
8778
requires 'List::Util', '1.62';
8879
requires 'Log::Any::Adapter';
8980
requires 'Log::Any::Adapter::Log4perl';
@@ -126,10 +117,7 @@ requires 'MooseX::Types::Moose';
126117
requires 'Mozilla::CA', '20211001';
127118
requires 'namespace::autoclean';
128119
requires 'Net::Fastly', '1.12';
129-
requires 'Net::HTTP', '6.22'; # LWP::UserAgent
130-
requires 'OrePAN2', '0.48';
131120
requires 'Parse::CPAN::Packages::Fast', '0.09';
132-
requires 'Parse::CSV', '2.04';
133121
requires 'Parse::PMFile', '0.43';
134122
requires 'Path::Iterator::Rule', '>=1.011';
135123
requires 'PAUSE::Permissions', '0.17';
@@ -153,9 +141,9 @@ requires 'Regexp::Common::time';
153141
requires 'Safe', '2.35'; # bug fixes (used by Parse::PMFile)
154142
requires 'Scalar::Util', '1.62'; # Moose
155143
requires 'Search::Elasticsearch', '== 2.03';
156-
requires 'strictures', '1';
157144
requires 'Term::Choose', '1.754'; # Git::Helpers
158145
requires 'Throwable::Error';
146+
requires 'Text::CSV_XS';
159147
requires 'Time::Local';
160148
requires 'Try::Tiny', '0.30';
161149
requires 'Type::Tiny', '2.000001';
@@ -178,6 +166,7 @@ requires 'MetaCPAN::Client', '2.029000';
178166
requires 'Module::Extract::Namespaces', '1.023';
179167
requires 'Module::Faker', '== 0.017';
180168
requires 'Module::Faker::Dist', '== 0.017';
169+
requires 'OrePAN2', '0.48';
181170
requires 'Parallel::ForkManager' => '2.02';
182171
requires 'Perl::Critic', '0.140';
183172
requires 'Perl::Tidy' => '== 20230309';

improve-search-results/app.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use Mojolicious::Lite;
22

33
use Mojo::Pg;
4-
use List::AllUtils 'first_index';
4+
use List::Util qw(first);
55

66
my $user = getpwuid($<); # for vagrant user on dev box
77

@@ -82,8 +82,8 @@ sub _perform_sco {
8282
my $url = Mojo::URL->new('http://search.cpan.org/search?mode=all&n=100');
8383
$url->query([query => $search]);
8484
my $tx = $c->app->ua->get($url);
85-
my $res = $tx->res->dom->find('.sr')->map('all_text');
86-
my $idx = first_index { $_ eq $expect } @{$res->to_array};
85+
my $res = $tx->res->dom->find('.sr')->map('all_text')->to_array;
86+
my $idx = first { $res->[$_] eq $expect } @{$res->to_array};
8787
return $idx < 0 ? undef : $idx + 1;
8888
}
8989

@@ -92,8 +92,8 @@ sub _perform_mweb {
9292
my $url = Mojo::URL->new('https://metacpan.org/search?size=100');
9393
$url->query([q => $search]);
9494
my $tx = $c->app->ua->get($url);
95-
my $res = $tx->res->dom->find('.module-result big strong a')->map('all_text');
96-
my $idx = first_index { $_ eq $expect } @{$res->to_array};
95+
my $res = $tx->res->dom->find('.module-result big strong a')->map('all_text')->to_array;
96+
my $idx = first { $res->[$_] eq $expect } 0 .. $#{$res};
9797
return $idx < 0 ? undef : $idx + 1;
9898
}
9999

@@ -210,4 +210,4 @@ sub _perform_mweb {
210210
211211
drop table if exists searches cascade;
212212
drop table if exists sources cascade;
213-
drop table if exists results cascade;
213+
drop table if exists results cascade;

lib/MetaCPAN/Document/File.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use utf8;
77
use Moose;
88
use ElasticSearchX::Model::Document;
99

10-
use List::AllUtils qw( any );
10+
use List::Util qw( any );
1111
use MetaCPAN::Document::Module ();
1212
use MetaCPAN::Types qw( Module );
1313
use MetaCPAN::Types::TypeTiny qw(

lib/MetaCPAN/Script/Backup.pm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use strict;
44
use warnings;
55
use feature qw( state );
66

7-
use Data::Printer;
87
use DateTime;
98
use IO::Zlib ();
109
use Cpanel::JSON::XS qw( decode_json encode_json );
@@ -112,7 +111,7 @@ sub run_restore {
112111

113112
try { $raw = decode_json($line) }
114113
catch {
115-
log_warn {"cannot decode JSON: $line --- $_"};
114+
log_warn {"cannot decode JSON: $line --- $&"};
116115
};
117116

118117
# Create our bulk_helper if we need,

lib/MetaCPAN/Script/Tickets.pm

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ use namespace::autoclean;
77
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
88

99
use HTTP::Request::Common qw( GET );
10-
use IO::String ();
1110
use Log::Contextual qw( :log :dlog );
1211
use MetaCPAN::Types::TypeTiny ();
13-
use Parse::CSV ();
12+
use Text::CSV_XS ();
1413
use Pithub ();
1514
use Ref::Util qw( is_hashref is_ref );
1615
use URI::Escape qw( uri_escape );
@@ -197,18 +196,20 @@ sub index_rt_bugs {
197196

198197
sub parse_tsv {
199198
my ( $self, $tsv ) = @_;
200-
$tsv =~ s/^#\s*(dist\s.+)/$1/m; # uncomment the field spec for Parse::CSV
199+
$tsv
200+
=~ s/^#\s*(dist\s.+)/$1/m; # uncomment the field spec for Text::CSV_XS
201201
$tsv =~ s/^#.*\n//mg;
202202

203+
open my $fh, '<', \$tsv;
204+
203205
# NOTE: This is byte-oriented.
204-
my $tsv_parser = Parse::CSV->new(
205-
handle => IO::String->new($tsv),
206+
my $tsv_parser = Text::CSV_XS->new( {
206207
sep_char => "\t",
207-
names => 1,
208-
);
208+
} );
209+
$tsv_parser->header($fh);
209210

210211
my %summary;
211-
while ( my $row = $tsv_parser->fetch ) {
212+
while ( my $row = $tsv_parser->getline_hr($fh) ) {
212213
$summary{ $row->{dist} }{'bugs'}{'rt'} = {
213214
source => $self->rt_dist_url( $row->{dist} ),
214215
active => $row->{active},

lib/MetaCPAN/Server/Controller.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use Moose;
44
use namespace::autoclean;
55

66
use Cpanel::JSON::XS ();
7-
use List::AllUtils ();
87
use Moose::Util ();
98
use MetaCPAN::Types::TypeTiny qw( HashRef );
109
use MetaCPAN::Util qw( single_valued_arrayref_to_scalar );

t/lib/MetaCPAN/Tests/Controller/Search/DownloadURL.pm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ sub run {
1919
"GET $module" );
2020
my $json = decode_json_ok($res);
2121

22-
use Data::Dump qw(pp);
23-
print STDERR ( pp( scalar $json ), "\n" );
22+
diag explain $json;
2423

2524
# my $got
2625
# = [ map { $_->{_source}{documentation} }

t/release/packages-unclaimable.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use warnings;
33
use lib 't/lib';
44

55
use Cpanel::JSON::XS ();
6-
use IO::String ();
7-
use List::AllUtils qw( uniq );
6+
use List::Util qw( uniq );
87
use MetaCPAN::Server::Test;
98
use MetaCPAN::TestHelpers qw( test_release );
109
use Module::Metadata ();
@@ -42,9 +41,10 @@ test_release(
4241

4342
my $content = $self->file_content('lib/Packages/Unclaimable.pm');
4443

44+
open my $fh, '<', \$content;
45+
4546
my $mm
46-
= Module::Metadata->new_from_handle(
47-
IO::String->new($content),
47+
= Module::Metadata->new_from_handle( $fh,
4848
'lib/Packages/Unclaimable.pm' );
4949

5050
is_deeply [ uniq sort $mm->packages_inside ],

0 commit comments

Comments
 (0)