X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=90da52b5b437b17328e7237d256a8fb8a83f8620;hb=6a6394f19f31dbc44cb5382d241890555e8cebd5;hp=73cbcebe78d2887edc39c35756732d0e567419b5;hpb=4557be612bbc10466b2de8381421805b29bb9f4e;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 73cbceb..90da52b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -53,16 +53,19 @@ my $test_requires = {
   'Test::Exception'          => '0.31',
   'Test::More'               => '0.92',
   'Test::Warn'               => '0.21',
+
+  # this is already a dep of n::c, but just in case - used by t/55namespaces_cleaned.t
+  # remove and do a manual glob-collection if n::c is no longer a dep
+  'Package::Stash'           => '0.28',
 };
 
 my $runtime_requires = {
-  'Carp::Clan'               => '6.0',
   'Class::Accessor::Grouped' => '0.10002',
-  'Class::C3::Componentised' => '1.0005',
+  'Class::C3::Componentised' => '1.0009',
   'Class::Inspector'         => '1.24',
   'Config::Any'              => '0.20',
   'Context::Preserve'        => '0.01',
-  'Data::Dumper::Concise'    => '1.000',
+  'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
   'Hash::Merge'              => '0.12',
   'MRO::Compat'              => '0.09',
@@ -70,11 +73,12 @@ my $runtime_requires = {
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.72',
+  'Test::Deep'               => '0.108',
   'Try::Tiny'                => '0.04',
 
   # XS (or XS-dependent) libs
-  'DBI'                      => '1.609',
-  'namespace::clean'         => '0.14',
+  'DBI'                      => '1.57',
+  'namespace::clean'         => '0.20',
   'Sub::Name'                => '0.04',
   'Variable::Magic'          => '0.44',
 
@@ -164,21 +168,6 @@ warn $optdep_msg if $Module::Install::AUTHOR;
 auto_install();
 warn $optdep_msg if $Module::Install::AUTHOR;
 
-# if this is a smoker, and some known-to-be-trouble reqs are already present
-# (are not missing reqs) - we can exit 1 now so that we register an N/A report
-# instead of a FAIL
-if ($ENV{AUTOMATED_TESTING} && ! $ENV{PERL5_CPANM_IS_RUNNING} && ! $ENV{RELEASE_TESTING}) {
-
-  eval {
-    require Package::Stash;
-    my $psv = Package::Stash->VERSION;
-    if ($psv != 0.13 and $psv >= 0.09 and $psv <= 0.15) {
-      warn "A trial version $psv of Package::Stash detected (known to break namespace::clean). "
-          ."Aborting useless smoke test\n";
-      exit 1;
-    }
-  };
-}
 
 # re-create various autogenerated documentation bits
 if ($Module::Install::AUTHOR) {
@@ -208,14 +197,20 @@ tests_recursive (qw|
 # temporary(?) until I get around to fix M::I wrt xt/
 # needs Module::Install::AuthorTests
 eval {
+  # this should not be necessary since the autoloader is supposed
+  # to work, but there were reports of it failing
+  require Module::Install::AuthorTests;
   recursive_author_tests (qw/xt/);
   1;
 } || do {
   if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
     my $err = $@;
+
+    # better error message in case of missing dep
     eval { require Module::Install::AuthorTests }
       || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode (or supply --skip_author_deps):\n\n$@\n";
-    die $@;
+
+    die $err;
   }
 };
 
@@ -262,6 +257,7 @@ no_index directory => $_ for (qw|
 |);
 no_index package => $_ for (qw/
   DBIx::Class::Storage::DBIHacks
+  DBIx::Class::Carp
 /);
 
 WriteAll();