X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=d4d11e384677740debbfc9c36e963aaae6af0a95;hb=ebc5c60a4ff45bb9ab7630e2512015b3b7cb2c96;hp=2ecd83f7d018f123737c64597cc3c81799922b99;hpb=6c96d73f97cc31543e7066cc7512bd3273c8b657;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 2ecd83f..d4d11e3 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -41,6 +41,9 @@ my $runtime_requires = { # FIXME - temporary, needs throwing out for something more efficient 'Data::Compare' => '1.22', + # Moo does not yet depend on this higher version + 'strictures' => '1.003001', + # DBI itself should be capable of installation and execution in pure-perl # mode. However it has never been tested yet, so consider XS for the time # being @@ -59,7 +62,7 @@ my $runtime_requires = { 'Data::Dumper::Concise' => '2.020', 'Data::Page' => '2.00', 'Hash::Merge' => '0.12', - 'Moo' => '0.009013', + 'Moo' => '0.009014', 'MRO::Compat' => '0.09', 'Module::Find' => '0.06', 'namespace::clean' => '0.20', @@ -102,26 +105,19 @@ if (-e '.git' or -e '.svn') { test_requires 'bareword::filehandles' => '0.003'; } -# Bail out on parallel testing -if ( - ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x - and - $1 > 1 -) { die <req_list_for('deploy'); + for (keys %$dep_req) { + test_requires ($_ => $dep_req->{$_}) + } +} # this is so we can order requires alphabetically # copies are needed for potential author requires injection @@ -167,18 +163,6 @@ nonauthor_stop_distdir_creation: \t\$(NOECHO) \$(ECHO) Creation of dists in non-author mode is not allowed \t\$(NOECHO) \$(FALSE) EOP - - # if the user has this env var set and no SQLT installed, tests will fail - # same rationale for direct test_requires as the strictures stuff above - # (even though no dist will be created from this) - if ($ENV{DBICTEST_SQLT_DEPLOY}) { - local @INC = ('lib', @INC); - require DBIx::Class::Optional::Dependencies; - my $dep_req = DBIx::Class::Optional::Dependencies->req_list_for('deploy'); - for (keys %$dep_req) { - test_requires ($_ => $dep_req->{$_}) - } - } } # compose final req list, for alphabetical ordering