Merge 'trunk' into 'sybase'

[dbsrgits/DBIx-Class.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 832a1be..5d05239 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,9 +13,11 @@ all_from 'lib/DBIx/Class.pm';
 test_requires 'Test::Builder'       => 0.33;
 test_requires 'Test::Deep'          => 0;
 test_requires 'Test::Exception'     => 0;
-test_requires 'Test::More'          => 0.82;
+test_requires 'Test::More'          => 0.92;
 test_requires 'Test::Warn'          => 0.11;
 
+test_requires 'File::Temp'          => 0.22;
+
 # Core
 requires 'List::Util'               => 0;
 requires 'Scalar::Util'             => 0;
@@ -86,7 +88,6 @@ my %force_requires_if_author = (
   # t/93storage_replication.t
   'Moose',                    => 0.87,
   'MooseX::AttributeHelpers'  => 0.21,
-  'MooseX::Traits',           => 0.06,
   'MooseX::Types',            => 0.16,
   'namespace::clean'          => 0.11,
   'Hash::Merge',              => 0.11,
@@ -112,6 +113,12 @@ my %force_requires_if_author = (
       'DateTime::Format::Oracle' => 0,
     ) : ()
   ,
+
+  $ENV{DBICTEST_SYBASE_DSN}
+    ? (
+      'DateTime::Format::Sybase' => 0,
+    ) : ()
+  ,
 );
 
 if ($Module::Install::AUTHOR) {