develooper Front page | perl.perl5.porters | Postings from March 2015

Re: [Encode] 2.72 released!

Thread Previous | Thread Next
From:
Steve Hay
Date:
March 14, 2015 12:13
Subject:
Re: [Encode] 2.72 released!
Message ID:
CADED=K5A4uHe-Tmu_9Q2ggbvW3qv9xmEa3pO7R4zW3_=23kMrw@mail.gmail.com
On 14 March 2015 at 02:57, Dan Kogai <dankogai@dan.co.jp> wrote:
> Porters,
>
> Just $Encode::VERSION++’ed.
>
>> On Mar 12, 2015, at 17:49, Steve Hay <steve.m.hay@googlemail.com> wrote:
>>
>> Just the $VERSION bump in encoding.pm is required for all tests to
>> pass in bleadperl, but as I noted here:
>>
>> http://www.nntp.perl.org/group/perl.perl5.porters/2015/03/msg226576.html
>>
>> it would also be nice to reinstate the accidentally deleted new tests
>> if the deletion was indeed accidental. It might just be worth chasing
>> up khw/bingos to check that if they don't reply on-list.
>>
>> On 12 March 2015 at 01:37, Dan Kogai <dankogai@dan.co.jp> wrote:
>>> Okay, I will. But is $VERSION++ enough or do I need to pull anything else?
>
> What I did is copy encoding.pm of bleadperl instead of just bumping the version.  Though functionally identical it is slightly different from 2.13 which comes with Encode 2.71:
>
> --- a/encoding.pm
> +++ b/encoding.pm
> @@ -1,6 +1,6 @@
> -# $Id: encoding.pm,v 2.13 2015/03/12 00:03:52 dankogai Exp $
> +# $Id: encoding.pm,v 2.14 2015/03/14 02:44:39 dankogai Exp dankogai $
>  package encoding;
> -our $VERSION = sprintf "%d.%02d", q$Revision: 2.13 $ =~ /(\d+)/g;
> +our $VERSION = sprintf "%d.%02d", q$Revision: 2.14 $ =~ /(\d+)/g;
>
>  use Encode;
>  use strict;
> @@ -8,6 +8,13 @@ use warnings;
>
>  use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
>
> +BEGIN {
> +    if ( ord("A") == 193 ) {
> +        require Carp;
> +        Carp::croak("encoding: pragma does not support EBCDIC platforms");
> +    }
> +}
> +
>  our $HAS_PERLIO = 0;
>  eval { require PerlIO::encoding };
>  unless ($@) {
> @@ -95,11 +102,6 @@ sub _get_locale_encoding {
>  }
>
>  sub import {
> -    if ( ord("A") == 193 ) {
> -        require Carp;
> -        Carp::croak("encoding: pragma does not support EBCDIC platforms");
> -    }
> -
>      if ($] >= 5.017) {
>         warnings::warnif("deprecated",
>                          "Use of the encoding pragma is deprecated")
>
> =head1 Availability
>

Thanks for the new version, which I've now pulled into bleadperl with
commit e455391f6bfb5b4f1211cedb87955a9a94390ab1.

Encode and blead are now in sync, which is good news for 5.22.

However, I fear that I wasn't quite clear enough in my reply to you
when I wrote "Just the $VERSION bump in encoding.pm is required for
all tests to pass in bleadperl". I meant just the $VERSION bump *on
top of* what was already in 2.71, not *instead of* the extra change
that you had in it (namely,
https://github.com/dankogai/p5-encode/pull/38/commits).

The point was that pulling that extra change into blead with no
$VERSION bump after 5.21.9 had been released caused cmp_version.t to
fail because it resulted in 5.21.9 and blead containing different
versions of encoding.pm with the same $VERSION. So a simple $VERSION
bump was required as well.

Instead, what you've done in 2.72 is to remove that extra change (i.e.
revert https://github.com/dankogai/p5-encode/pull/38/commits) and
literally just bump the $VERSION instead (which isn't actually
required from blead's perspective now since the file is otherwise
identical to that in 5.21.9!... although it is required for Encode's
own sanity since the file differs from that in 2.71 now).

I don't think this matters for 5.22 since's Karl's change was only
sent upstream (to you) anyway. I'm guessing that if it was important
that it be in 5.22 then he would have applied it directly to blead as
well as sending the patch upstream.

I only point it out because your 2.72 release
(https://github.com/dankogai/p5-encode/commit/5ac059564287c10e630675af3b65f6e8b1103528)
actually undoes Karl's pull request on Encode which you'd previously
merged in https://github.com/dankogai/p5-encode/commit/6b56748b27e44598c27027a6dccd3b1c217ef041.
Presumably you'll want to reapply that pull request for your 2.73
release (with a $VERSION bump too, of course!).

Also, as I noted before, I think the accidentally-lost-from-blead commit

http://perl5.git.perl.org/perl.git/commit/5eef447b12283016e9c57a31362edb829884a7ed

should probably get picked up too, but again I don't think that's
required for 5.22.

Apologies for any confusion caused. Thanks as always for your work on Encode.

Thread Previous | Thread Next


nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About