From: Graham Knop Date: Wed, 28 Apr 2021 09:11:46 +0000 (+0200) Subject: update distar url X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=HEAD;hp=ef3529c9e677c10cbe352e90c868f303b6739844 update distar url --- diff --git a/.travis.yml b/.travis.yml index 2f38c5c..4fbb56f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,12 @@ before_install: - eval $(curl https://travis-perl.github.io/init) --perl - $HELPERS_ROOT/bin/cpan-config install: - - cpanm --notest --metacpan --skip-satisfied --with-develop --installdeps . - - perl Makefile.PL + - build-dist + - cd $BUILD_DIR + - cpanm -q --showdeps --with-develop . | grep -v "^perl[~@]" | AUTHOR_TESTING=0 cpanm --notest --metacpan --skip-satisfied + + - test_run='make test' + - AUTHOR_TESTING=0 cpanm --notest --metacpan --skip-satisfied Test2::Harness && test_run='yath test t xt' || true # enable various test options, including parallel testing - export AUTOMATED_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 @@ -34,10 +38,8 @@ install: - export RELEASE_TESTING=1 - export PERL_AUTOINSTALL=--skip - - make manifest - script: - - make disttest + - make && $test_run # Test reverse deps (high-profile modules, taken from from Task::Catalyst): # (note: currently skipping DBIC deps for speed) diff --git a/Changes b/Changes index f64dafe..95fa030 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ # This file documents the revision history for Perl extension Catalyst. +5.90128 - 2020-09-11 + - fix command to run psgi compile test if Catalyst not already installed + - improve debugging output on psgi compile test + 5.90_127 - 2020-07-27 - fix TODO tests for uri_for as a class method - silence warnings in tests diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 4110744..de488a4 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -53,6 +53,9 @@ use Class::Load 'load_class'; use Encode 2.21 'decode_utf8', 'encode_utf8'; use Scalar::Util; +our $VERSION = '5.90128'; +$VERSION =~ tr/_//d; + BEGIN { require 5.008003; } has stack => (is => 'ro', default => sub { [] }); @@ -206,10 +209,6 @@ sub composed_stats_class { __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC); -# Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90_127'; -$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases - sub import { my ( $class, @arguments ) = @_; diff --git a/lib/Catalyst/Plugin/Unicode/Encoding.pm b/lib/Catalyst/Plugin/Unicode/Encoding.pm index a023d56..45ee480 100644 --- a/lib/Catalyst/Plugin/Unicode/Encoding.pm +++ b/lib/Catalyst/Plugin/Unicode/Encoding.pm @@ -1,6 +1,7 @@ package Catalyst::Plugin::Unicode::Encoding; -our $VERSION = '5.90_127'; +our $VERSION = '5.90128'; +$VERSION =~ tr/_//d; 1; diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm index 3070abb..c8ba4fe 100644 --- a/lib/Catalyst/Runtime.pm +++ b/lib/Catalyst/Runtime.pm @@ -5,10 +5,8 @@ use warnings; BEGIN { require 5.008003; } -# Remember to update this in Catalyst as well! - -our $VERSION = '5.90_127'; -$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases +our $VERSION = '5.90128'; +$VERSION =~ tr/_//d; =head1 NAME diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include index 13386d7..b3093e3 100644 --- a/maint/Makefile.PL.include +++ b/maint/Makefile.PL.include @@ -1,4 +1,4 @@ -BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } +BEGIN { -e 'Distar' or system qw(git clone https://github.com/p5sagit/Distar.git) } use lib 'Distar/lib'; use Distar 0.001;