From: Peter Rabbitson Date: Wed, 22 Jan 2014 18:24:53 +0000 (+0100) Subject: Scalar::Util 1.38 seems to be fixed, revert 647da28e X-Git-Tag: v0.08260~25 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf836d21990728b47fdd2d57182ea38e5e77e8c9;p=dbsrgits%2FDBIx-Class.git Scalar::Util 1.38 seems to be fixed, revert 647da28e --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 569385e..ff099c9 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -62,13 +62,12 @@ if [[ "$CLEANTEST" = "true" ]]; then # # We are also not "quite ready" for SQLA 1.99, do not consider it # - # L::U is a workaround for RT#92226 (argh) - installdeps 'Test::Builder~<1.005' 'SQL::Abstract~<1.99' 'List::Util~!=1.36' + installdeps 'Test::Builder~<1.005' 'SQL::Abstract~<1.99' elif ! CPAN_is_sane ; then # no configure_requires - we will need the usual suspects anyway # without pre-installing these in one pass things like extract_prereqs won't work - installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build P/PE/PEVANS/Scalar-List-Utils-1.35.tar.gz + installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build fi @@ -93,7 +92,7 @@ else parallel_installdeps_notest File::Path parallel_installdeps_notest Carp parallel_installdeps_notest Module::Build - parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime 'List::Util~<1.36' + parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal 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 @@ -201,7 +200,7 @@ else # listalldeps is deliberate - will upgrade everything it can find # we exclude SQLA specifically, since we do not want to pull # in 1.99_xx on bleadcpan runs - parallel_installdeps_notest $(make listalldeps | grep -vP 'List::Util|SQL::Abstract') + parallel_installdeps_notest $(make listalldeps | grep -vP 'SQL::Abstract') fi