From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 17 Sep 2013 07:52:02 +0000 (+0200)
Subject: These workarounds are thankfully no longer needed
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e1ab2f7a869eaeffd751ee2431642591918bc2a3;p=dbsrgits%2FDBIx-Class-Historic.git

These workarounds are thankfully no longer needed

Loading strictures will only complain about missing optdeps if used
within a t/, and dbic is (and will remain, sorry Matt) structures-free
deliberately, so there you have it
---

diff --git a/Makefile.PL b/Makefile.PL
index 468e537..c3cebfa 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -103,17 +103,6 @@ my $test_requires = {
   'Package::Stash'           => '0.28',
 };
 
-# make strictures.pm happy (DO NOT LIKE, TOO MUCH XS!)
-# (i.e. what if the .git/.svn is *not* because of DBIC?)
-#
-# Note - this is added as test_requires *directly*, so it gets properly
-# excluded on META.yml cleansing
-if (-e '.git' or -e '.svn') {
-  test_requires 'indirect'              => '0.25';
-  test_requires 'multidimensional'      => '0.008';
-  test_requires 'bareword::filehandles' => '0.003';
-}
-
 # 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)
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index a2df851..c275c5d 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -87,10 +87,10 @@ else
   parallel_installdeps_notest ExtUtils::MakeMaker
   parallel_installdeps_notest File::Path
   parallel_installdeps_notest Carp
-  parallel_installdeps_notest Module::Build ExtUtils::Depends
-  parallel_installdeps_notest Module::Runtime File::Spec Data::Dumper
+  parallel_installdeps_notest Module::Build Module::Runtime
+  parallel_installdeps_notest File::Spec Data::Dumper
   parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal R/RS/RSAVAGE/Tree-DAG_Node-1.13.tgz
-  parallel_installdeps_notest Test::Warn bareword::filehandles B::Hooks::EndOfScope Test::Differences HTTP::Status
+  parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status
   parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
   parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
   parallel_installdeps_notest Moose Module::Install JSON SQL::Translator
@@ -125,20 +125,8 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # we may need to prepend some stuff to that list
   HARD_DEPS="$(echo $(make listdeps))"
 
-
 ##### TEMPORARY WORKAROUNDS
 
-  # this is a fucked CPAN - won't understand configure_requires of
-  # various pieces we may run into
-  # FIXME - need to get these off metacpan or something instead
-  CPAN_is_sane || HARD_DEPS="ExtUtils::Depends B::Hooks::OP::Check $HARD_DEPS"
-
-  # The unicode-in-yaml bug on older cpan clients
-  # FIXME there got to be a saner way to fix this...
-  perl -M5.008008 -e 1 &> /dev/null || \
-     run_or_err "Installing multidimensional and bareword::filehandles via cpanm" \
-        "cpanm multidimensional bareword::filehandles"
-
   # work around Params::Validate not having a Makefile.PL so really old
   # toolchains can not figure out what the prereqs are ;(
   # Need to do more research before filing a bug requesting Makefile inclusion