New namespace::clean to resolve the Package::Stash megafail

diff --git a/Changes b/Changes
index d130aad..6421633 100644 (file)
--- a/Changes
+++ b/Changes
@@ -28,6 +28,8 @@ Revision history for DBIx::Class
     * Misc
         - Fix test warning on win32 - at this point the test suite is
           warning-free on all known OSes
+        - Require newest namespace::clean which in turn depends on new
+          installable Package::Stash
 
 0.08126 2010-12-28 18:10 (UTC)
     * Fixes

diff --git a/Makefile.PL b/Makefile.PL
index 73cbceb..e44489b 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -74,7 +74,7 @@ my $runtime_requires = {
 
   # XS (or XS-dependent) libs
   'DBI'                      => '1.609',
-  'namespace::clean'         => '0.14',
+  'namespace::clean'         => '0.20',
   'Sub::Name'                => '0.04',
   'Variable::Magic'          => '0.44',
 
@@ -164,21 +164,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) {