Skip Menu |

This queue is for tickets about the podlators CPAN distribution.

Report information
The Basics
Id: 110385
Status: resolved
Priority: 0/
Queue: podlators

People
Owner: RRA [...] cpan.org
Requestors: ether [...] cpan.org
Cc:
AdminCc:

Bug Information
Severity: (no value)
Broken in: (no value)
Fixed in: 4.04



Subject: patch: skip shipping .travis.yml
I am patching blead to update podlators to the latest version; this patch reflects a change I am making there so .travis.yml does not end up in the main perl MANIFEST.
Subject: 0001-do-not-ship-.travis.yml.patch
From 83bdb7cc4b53dce34fe3bd72c9c9ad45180d75ab Mon Sep 17 00:00:00 2001 From: Karen Etheridge <ether@cpan.org> Date: Wed, 16 Dec 2015 20:23:00 -0800 Subject: [PATCH] do not ship .travis.yml diff --git a/MANIFEST b/MANIFEST index 3ceeef3..3dee89e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,5 +1,4 @@ .gitignore -.travis.yml bin/pod2man bin/pod2text Changes diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 8ed3334..9c23248 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -33,3 +33,5 @@ # Avoid archives of this distribution \bpodlators-[\d\.\_]+ + +^\.travis\.yml$ -- 2.6.2
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Thu, 17 Dec 2015 11:16:11 -0800
To: bug-podlators [...] rt.cpan.org
From: Russ Allbery <rra [...] cpan.org>
Ah, thank you! Will fix in the next release of podlators. I didn't even think about that. -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
On 2015-12-17 11:16:22, RRA wrote: Show quoted text
> Ah, thank you! Will fix in the next release of podlators. I didn't even > think about that.
I think I may have a few more small patches for you -- I haven't finished the sync into blead yet. I'll update this ticket shortly!
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Sat, 19 Dec 2015 11:20:28 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> I am patching blead to update podlators to the latest version; this > patch reflects a change I am making there so .travis.yml does not end up > in the main perl MANIFEST.
Applied. I'll hold off on making a new release until you've finished the integration, in case there are any other issues, and then release 4.04 with any fixes. Thanks again! -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
Here is another patch:
Subject: 0001-remove-x-bits-on-tests.patch
From 0bebdeaab63de5ddc5e8fd7ea9181802e96b0566 Mon Sep 17 00:00:00 2001 From: Karen Etheridge <ether@cpan.org> Date: Wed, 16 Dec 2015 21:45:36 -0800 Subject: [PATCH] remove +x bits on tests diff --git a/t/docs/pod-spelling.t b/t/docs/pod-spelling.t old mode 100755 new mode 100644 diff --git a/t/docs/pod.t b/t/docs/pod.t old mode 100755 new mode 100644 diff --git a/t/docs/synopsis.t b/t/docs/synopsis.t old mode 100755 new mode 100644 diff --git a/t/general/basic.t b/t/general/basic.t old mode 100755 new mode 100644 diff --git a/t/general/filehandle.t b/t/general/filehandle.t old mode 100755 new mode 100644 diff --git a/t/general/pod-parser.t b/t/general/pod-parser.t old mode 100755 new mode 100644 diff --git a/t/man/basic.t b/t/man/basic.t old mode 100755 new mode 100644 diff --git a/t/man/devise-date.t b/t/man/devise-date.t old mode 100755 new mode 100644 diff --git a/t/man/devise-title.t b/t/man/devise-title.t old mode 100755 new mode 100644 diff --git a/t/man/empty.t b/t/man/empty.t old mode 100755 new mode 100644 diff --git a/t/man/heading.t b/t/man/heading.t old mode 100755 new mode 100644 diff --git a/t/man/options.t b/t/man/options.t old mode 100755 new mode 100644 diff --git a/t/man/utf8-io.t b/t/man/utf8-io.t old mode 100755 new mode 100644 diff --git a/t/parselink/basic.t b/t/parselink/basic.t old mode 100755 new mode 100644 diff --git a/t/style/minimum-version.t b/t/style/minimum-version.t old mode 100755 new mode 100644 diff --git a/t/style/module-version.t b/t/style/module-version.t old mode 100755 new mode 100644 diff --git a/t/style/strict.t b/t/style/strict.t old mode 100755 new mode 100644 diff --git a/t/text/basic.t b/t/text/basic.t old mode 100755 new mode 100644 diff --git a/t/text/color.t b/t/text/color.t old mode 100755 new mode 100644 diff --git a/t/text/empty.t b/t/text/empty.t old mode 100755 new mode 100644 diff --git a/t/text/encoding.t b/t/text/encoding.t old mode 100755 new mode 100644 diff --git a/t/text/options.t b/t/text/options.t old mode 100755 new mode 100644 diff --git a/t/text/overstrike.t b/t/text/overstrike.t old mode 100755 new mode 100644 diff --git a/t/text/perlio.t b/t/text/perlio.t old mode 100755 new mode 100644 diff --git a/t/text/termcap.t b/t/text/termcap.t old mode 100755 new mode 100644 diff --git a/t/text/utf8.t b/t/text/utf8.t old mode 100755 new mode 100644 -- 2.6.2
And one more:
Subject: 0001-fix-shebangs-on-scripts.patch
From 1eac074cf91f525ba202161b7b5e739d88efadad Mon Sep 17 00:00:00 2001 From: Karen Etheridge <ether@cpan.org> Date: Mon, 21 Dec 2015 17:22:12 -0800 Subject: [PATCH] fix shebangs on scripts ExtUtils::MakeMaker rewrites #!/usr/bin/perl to the location of the perl being used for the install, but does not edit other forms of the shebang. diff --git a/bin/pod2man b/bin/pod2man index 203e75f..46de7a7 100755 --- a/bin/pod2man +++ b/bin/pod2man @@ -1,4 +1,4 @@ -#!perl +#!/usr/bin/perl # pod2man -- Convert POD data to formatted *roff input. # diff --git a/bin/pod2text b/bin/pod2text index 9394f0f..838f75e 100755 --- a/bin/pod2text +++ b/bin/pod2text @@ -1,4 +1,4 @@ -#!perl +#!/usr/bin/perl # pod2text -- Convert POD data to formatted ASCII text. # -- 2.6.2
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Mon, 21 Dec 2015 17:28:50 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> Queue: podlators > Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=110385 >
Show quoted text
> Here is another patch:
Show quoted text
> Subject: [PATCH] remove +x bits on tests
Could you let me know what the rationale is for this one? I'm happy to apply it to make things easier for Perl core, but it surprises me that it's necessary, and it's minorly convenient for development to be able to just run the test. Does this break sommething within Perl core? -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
RT-Send-CC: RRA [...] cpan.org
On 2015-12-21 20:23:15, ETHER wrote: Show quoted text
> And one more:
Show quoted text
> ExtUtils::MakeMaker rewrites #!/usr/bin/perl to the location of the perl being used > for the install, but does not edit other forms of the shebang.
I think this is not true --- EUMM is able to rewrite the shebang if the first argument contains the word perl. "#!perl" was always supported IMHO.
On 2015-12-21 23:32:29, SREZIC wrote: Show quoted text
> On 2015-12-21 20:23:15, ETHER wrote:
> > And one more:
>
> > ExtUtils::MakeMaker rewrites #!/usr/bin/perl to the location of the > > perl being used > for the install, but does not edit other forms of > > the shebang.
> > I think this is not true --- EUMM is able to rewrite the shebang if > the first argument contains the word perl. "#!perl" was always > supported IMHO.
*tests* Ah, yes, it does -- never mind then!
On 2015-12-21 17:29:08, RRA wrote: Show quoted text
> "Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: >
> > Queue: podlators > > Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=110385 >
>
> > Here is another patch:
>
> > Subject: [PATCH] remove +x bits on tests
> > Could you let me know what the rationale is for this one? I'm happy to > apply it to make things easier for Perl core, but it surprises me that > it's necessary, and it's minorly convenient for development to be able to > just run the test. Does this break sommething within Perl core?
Stripping +x bits is necessary for blead, but fixing up permission bits is already a step in the "importing from CPAN" guide, so there is no great loss if you do not apply that change here -- especially if you rely on the bit being set to run tests directly. (Personally, I usually just 'make test' or 'prove -lr t'.)
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Sat, 02 Jan 2016 19:36:55 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> Queue: podlators > Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=110385 >
Show quoted text
Thanks for all your work on this! One quick question: the last commit to that branch introduces a new Makefile.PL with contents: use strict; use warnings; use ExtUtils::MakeMaker; WriteMakefile( NAME => 'Pod', DISTNAME => 'podlators', VERSION_FROM => 'lib/Pod/Man.pm', EXE_FILES => [ 'bin/pod2man', 'bin/pod2text' ], AUTHOR => 'Russ Allbery (rra@stanford.edu)', ABSTRACT => 'Convert POD data to various other formats' ); Is there something I can change to make this no longer necessary? My primary concern is that it has an old email address for me instead of the rra@cpan.org address that I now use for all Perl work. But it would also be great if Perl blead could use the same Makefile.PL file used for the CPAN distribution so that it gets thorough testing in both environments. -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
On 2016-01-02 19:37:07, RRA wrote: Show quoted text
> Is there something I can change to make this no longer necessary? My > primary concern is that it has an old email address for me instead of the > rra@cpan.org address that I now use for all Perl work. But it would also > be great if Perl blead could use the same Makefile.PL file used for the > CPAN distribution so that it gets thorough testing in both environments.
Sorry about the old email! I revived the old version of the Makefile.PL that was in blead from several years ago and neglected to see the data had changed; I will fix that now. I don't see any way of using the same Makefile.PL as in the cpan distribution, as the manpages are not installed from the cpan/podlators directory, but instead from pod/ directly. However, I can bring most of the content in, as it is harmless (LICENSE, PERL_VERSION etc). Attached is another small patch, tweaking the Makefile.PL slightly to add more modern metadata (it's backwards-compatible, if you ship with a recent EUMM).
Subject: 0001-generate-v2-META-fix-comment-for-test-argument.patch
From b86e2452ad313b0569080c1b27cd41ab755076dc Mon Sep 17 00:00:00 2001 From: Karen Etheridge <ether@cpan.org> Date: Sun, 3 Jan 2016 10:40:24 -0800 Subject: [PATCH] generate v2 META; fix comment for "test" argument diff --git a/Makefile.PL b/Makefile.PL index c5d459e..1b8dc51 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -73,7 +73,7 @@ WriteMakefile( 'Pod::Simple' => 3.06, }, - # ExtUtils::MakeMaker doesn't pick up nested test directories by default. + # older ExtUtils::MakeMaker doesn't pick up nested test directories by default. test => { TESTS => 't/*/*.t' }, # For older versions of Perl, we have to force installation into the Perl @@ -90,10 +90,18 @@ WriteMakefile( # metadata. ($ExtUtils::MakeMaker::VERSION >= 6.46 ? ( META_ADD => { + 'meta-spec' => { version => 2 }, + dynamic_config => 0, resources => { - repository => 'git://git.eyrie.org/perl/podlators.git', - bugtracker => - 'https://rt.cpan.org/Public/Dist/Display.html?Name=podlators', + repository => { + url => 'git://git.eyrie.org/perl/podlators.git', + web => 'http://git.eyrie.org/gitweb/gitweb.cgi?p=perl/podlators.git', + type => 'git', + }, + bugtracker => { + mailto => 'bug-podlators@rt.cpan.org', + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=podlators', + }, }, }, ) : ()), -- 2.6.2
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Sun, 03 Jan 2016 10:49:43 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> Sorry about the old email! I revived the old version of the Makefile.PL > that was in blead from several years ago and neglected to see the data > had changed; I will fix that now.
Not a problem. Really appreciate all your work on the merge! Show quoted text
> I don't see any way of using the same Makefile.PL as in the cpan > distribution, as the manpages are not installed from the cpan/podlators > directory, but instead from pod/ directly. However, I can bring most of > the content in, as it is harmless (LICENSE, PERL_VERSION etc).
Ah! Yes, that makes sense. And it's probably not particularly important to have all that stuff set in blead Perl (probably likewise for the email address, although there was some minor chance it might confuse someone). Show quoted text
> Attached is another small patch, tweaking the Makefile.PL slightly to > add more modern metadata (it's backwards-compatible, if you ship with a > recent EUMM).
Thanks! Will merge for the next release. Some of that is in podlators 4.04 already, but I missed a few additional useful tweaks. -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
Oops, ignore that last patch; I hadn't pulled down your changes in 4.04 yet. I'll prepare another one momentarily.
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Sun, 03 Jan 2016 11:03:55 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> Queue: podlators > Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=110385 >
Show quoted text
> Oops, ignore that last patch; I hadn't pulled down your changes in 4.04 > yet. I'll prepare another one momentarily.
Already handled. :) https://github.com/rra/podlators has the latest. -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print
Closing this as all the patches should now be merged except for the executable bit change. (It looked like that was optional, and I like keeping them as a convenience in the main distribution.) Most of this was in 4.04. There's some additional metadata that will be in 4.05.
On 2016-01-03 10:54:29, ETHER wrote: Show quoted text
> Oops, ignore that last patch; I hadn't pulled down your changes in > 4.04 yet. I'll prepare another one momentarily.
And here it is.
Subject: 0001-more-v2-metadata-fix-comment-for-test-argument.patch
From 504abb562cdc00008e98917424ee2da0369cbbc0 Mon Sep 17 00:00:00 2001 From: Karen Etheridge <ether@cpan.org> Date: Sun, 3 Jan 2016 10:58:20 -0800 Subject: [PATCH] more v2 metadata; fix comment for "test" argument --- Makefile.PL | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 660078f..e2dd9b2 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -75,7 +75,7 @@ my %metadata = ( 'Pod::Simple' => 3.06, }, - # ExtUtils::MakeMaker doesn't pick up nested test directories by default. + # old ExtUtils::MakeMaker doesn't pick up nested test directories by default. test => { TESTS => 't/*/*.t' }, # For older versions of Perl, we have to force installation into the Perl @@ -86,9 +86,12 @@ my %metadata = ( # Additional metadata. META_ADD => { 'meta-spec' => { version => 2 }, + dynamic_config => 0, resources => { - bugtracker => - 'https://rt.cpan.org/Public/Dist/Display.html?Name=podlators', + bugtracker => { + mailto => 'bug-podlators@rt.cpan.org', + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=podlators', + }, homepage => 'http://www.eyrie.org/~eagle/software/podlators/', repository => { url => 'git://github.com/rra/podlators.git', -- 2.6.2
On 2016-01-03 11:09:31, RRA wrote: Show quoted text
> Closing this as all the patches should now be merged except for the > executable bit change. (It looked like that was optional, and I like > keeping them as a convenience in the main distribution.) Most of this > was in 4.04. There's some additional metadata that will be in 4.05.
Yup, the +x bit is fine in either direction, as there's an explicit instruction in the blead porting guide to strip +x bits from files when importing cpan distributions across. The 4.04 update is now reflected in this blead patch (does not include the META tweaks, to keep the patch simple, but Makefile.PL is now nearly identical: https://rt.perl.org/Ticket/Display.html?id=127136
Subject: Re: [rt.cpan.org #110385] patch: skip shipping .travis.yml
Date: Sun, 03 Jan 2016 12:23:48 -0800
To: "Karen Etheridge via RT" <bug-podlators [...] rt.cpan.org>
From: Russ Allbery <rra [...] cpan.org>
"Karen Etheridge via RT" <bug-podlators@rt.cpan.org> writes: Show quoted text
> The 4.04 update is now reflected in this blead patch (does not include > the META tweaks, to keep the patch simple, but Makefile.PL is now nearly > identical: https://rt.perl.org/Ticket/Display.html?id=127136
Thank you! -- #!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker $^=q;@!>~|{>krw>yn{u<$$<[~||<Juukn{=,<S~|}<Jwx}qn{<Yn{u<Qjltn{ > 0gFzD gD, 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{ rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print