From: Jay Hannah Date: Tue, 16 Jan 2018 22:43:48 +0000 (-0600) Subject: Merge branch 'pr/154' into release-candidates/rc-5.90116 X-Git-Tag: 5.90116~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=dddc7ec8cc0e9112ff51caad562a15e3699e3fab;hp=7060a5792b73efd8f5fdb6b9b7281d6394b5c5b6 Merge branch 'pr/154' into release-candidates/rc-5.90116 Conflicts jhannah resolved manually: Makefile.PL lib/Catalyst.pm --- diff --git a/.travis.yml b/.travis.yml index 9a04424..05fa29a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,15 @@ install: - cpanm --notest --metacpan --skip-satisfied --installdeps . - echo y | perl Makefile.PL + # installing Catalyst::Devel above causes the latest release of + # Catalyst::Runtime to be installed, but the version we're testing might + # have additional deps that aren't yet satisfied. so we should try + # installing deps again now that the MYMETA has been created (and we'll also + # need to delete the now-unneeded cpanfile so that cpanm doesn't choose it + # in preference to the MYMETA) + - rm -f cpanfile + - cpanm --notest --metacpan --skip-satisfied --installdeps . + # enable various test options, including parallel testing - export AUTOMATED_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 diff --git a/Makefile.PL b/Makefile.PL index f1d8607..2140deb 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -26,7 +26,7 @@ author 'Sebastian Riedel '; authority('cpan:MSTROUT'); all_from 'lib/Catalyst/Runtime.pm'; -requires 'List::Util' => '1.45'; +requires 'List::Util' => '1.45'; # for uniq() requires 'namespace::autoclean' => '0.28'; requires 'namespace::clean' => '0.23'; requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903'; diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 8c598ba..d4701cc 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -27,6 +27,7 @@ use HTML::Entities; use Tree::Simple qw/use_weak_refs/; use Tree::Simple::Visitor::FindByUID; use Class::C3::Adopt::NEXT; +use List::Util qw/uniq/; use attributes; use String::RewritePrefix; use Catalyst::EngineLoader;