SQLA 1.79 shipped - revert tempextlib hack from d0435d75

diff --git a/.gitignore b/.gitignore
index 81d2445..c8cda3e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,3 @@ t/var/
 *~
 maint/.Generated_Pod
 examples/Schema/db
-
-lib/DBIx/Class/_TempExtlib

diff --git a/Makefile.PL b/Makefile.PL
index ff2682c..f6d3815 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,40 +15,6 @@ BEGIN {
   $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) );
 }
 
-##
-## TEMPORARY (and non-portable)
-## Get trial SQLA
-##
-BEGIN {
-  my $target_libdir = 'lib/DBIx/Class/_TempExtlib';
-
-  if ( ($Module::Install::AUTHOR or $ENV{TRAVIS}) and ! $ENV{MAKELEVEL} ) {
-
-    `rm -rf $target_libdir`;
-    `mkdir $target_libdir`;
-    for (
-      [ 'SQL-Abstract' => 'master' ],
-    ) {
-      my $tdir = "/tmp/dbictemplib/$_->[0]/";
-
-      `rm -rf $tdir`;
-
-      `GIT_SSH=maint/careless_ssh.bash git clone --bare --quiet --branch=$_->[1] --depth=1 git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`;
-      printf "\nIncluding %s git rev %s\n",
-        $_->[0],
-        scalar `GIT_DIR=$tdir git rev-parse $_->[1]`,
-      ;
-      `git archive --format=tar --remote=file://$tdir $_->[1] lib/ | tar --strip-components=1 -xC $target_libdir`;
-
-      #`rm -rf $tdir`;
-    }
-
-    unshift @INC, $target_libdir;
-
-    no_index directory => $target_libdir;
-  }
-}
-
 name         'DBIx-Class';
 version_from 'lib/DBIx/Class.pm';
 perl_version '5.008001';
@@ -96,7 +62,7 @@ my $runtime_requires = {
   'namespace::clean'         => '0.24',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
-  'SQL::Abstract'            => '1.78',
+  'SQL::Abstract'            => '1.79',
   'Try::Tiny'                => '0.07',
 
   # Technically this is not a core dependency - it is only required

diff --git a/lib/DBIx/Class/_Util.pm b/lib/DBIx/Class/_Util.pm
index db885ce..053e0a5 100644 (file)
--- a/lib/DBIx/Class/_Util.pm
+++ b/lib/DBIx/Class/_Util.pm
@@ -4,37 +4,6 @@ package # hide from PAUSE
 use warnings;
 use strict;
 
-# Temporary - tempextlib
-use namespace::clean;
-BEGIN {
-  require Module::Runtime;
-  require File::Spec;
-
-  # There can be only one of these, make sure we get the bundled part and
-  # *not* something off the site lib
-  for (qw(
-    DBIx::Class::SQLMaker
-    SQL::Abstract
-    SQL::Abstract::Test
-  )) {
-    if ($INC{Module::Runtime::module_notional_filename($_)}) {
-      die "\nUnable to continue - a part of the bundled templib contents "
-        . "was already loaded (likely an older version from CPAN). "
-        . "Make sure that @{[ __PACKAGE__ ]} is loaded before $_\n\n"
-      ;
-    }
-  }
-
-  our ($HERE) = File::Spec->rel2abs(
-    File::Spec->catdir( (File::Spec->splitpath(__FILE__))[1], '_TempExtlib' )
-  ) =~ /^(.*)$/; # screw you, taint mode
-
-  die "TempExtlib $HERE does not seem to exist - perhaps you need to run `perl Makefile.PL` in the DBIC checkout?\n"
-    unless -d $HERE;
-
-  unshift @INC, $HERE;
-}
-
 use constant SPURIOUS_VERSION_CHECK_WARNINGS => ($] < 5.010 ? 1 : 0);
 
 BEGIN {

diff --git a/maint/careless_ssh.bash b/maint/careless_ssh.bash
deleted file mode 100755 (executable)
index 1b9e0bc..0000000
--- a/maint/careless_ssh.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"

diff --git a/t/53lean_startup.t b/t/53lean_startup.t
index b6c8be9..525c46a 100644 (file)
--- a/t/53lean_startup.t
+++ b/t/53lean_startup.t
@@ -112,9 +112,6 @@ BEGIN {
     Class::Accessor::Grouped
     Class::C3::Componentised
     SQL::Abstract
-
-    Module::Runtime
-    File::Spec
   ));
 
   require DBICTest::Schema;

diff --git a/xt/footers.t b/xt/footers.t
index 7132857..9882b52 100644 (file)
--- a/xt/footers.t
+++ b/xt/footers.t
@@ -23,7 +23,6 @@ find({
 
     return unless -f $fn;
     return unless $fn =~ / \. (?: pm | pod ) $ /ix;
-    return if $fn =~ qr{\Qlib/DBIx/Class/_TempExtlib/};
 
     my $data = do { local (@ARGV, $/) = $fn; <> };
 

diff --git a/xt/podcoverage.t b/xt/podcoverage.t
index dff0acf..a16a365 100644 (file)
--- a/xt/podcoverage.t
+++ b/xt/podcoverage.t
@@ -114,8 +114,6 @@ my $exceptions = {
         /]
     },
 
-    'DBIx::Class::_TempExtlib*'                     => { skip => 1 },
-
     'DBIx::Class::Admin::*'                         => { skip => 1 },
     'DBIx::Class::ClassResolver::PassThrough'       => { skip => 1 },
     'DBIx::Class::Componentised'                    => { skip => 1 },