[PATCH] Upgrade CPAN-Meta to 2.150010 #15526
Comments
From @karenetheridgeI'm not sure if these commits should be combined into one - a few Porting tests fail with the first commit before the second is applied. |
From @karenetheridge0002-regenerate-META.-using-new-CPAN-Meta-and-always-use-.patchFrom 919bc7467c079c7d552c911e2ddbc6b5281ca3ff Mon Sep 17 00:00:00 2001
From: Karen Etheridge <ether@cpan.org>
Date: Thu, 18 Aug 2016 11:35:11 -0700
Subject: [PATCH 2/3] regenerate META.* using new CPAN::Meta, and always use
the core serializers
diff --git a/META.json b/META.json
index 5458851..aa68709 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"perl5-porters@perl.org"
],
"dynamic_config" : 1,
- "generated_by" : "CPAN::Meta version 2.150005",
+ "generated_by" : "CPAN::Meta version 2.150010",
"license" : [
"perl_5"
],
diff --git a/META.yml b/META.yml
index 1253e9d..25a0777 100644
--- a/META.yml
+++ b/META.yml
@@ -4,7 +4,7 @@ author:
- perl5-porters@perl.org
build_requires: {}
dynamic_config: 1
-generated_by: 'CPAN::Meta version 2.150005, CPAN::Meta::Converter version 2.150005'
+generated_by: 'CPAN::Meta version 2.150010, CPAN::Meta::Converter version 2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/Porting/makemeta b/Porting/makemeta
index cb6944e..9259b20 100644
--- a/Porting/makemeta
+++ b/Porting/makemeta
@@ -8,6 +8,10 @@ use strict;
use warnings;
use Getopt::Std;
+# avoid unnecessary churn in x_serialization_backend in META.*
+$ENV{PERL_JSON_BACKEND} = $ENV{CPAN_META_JSON_BACKEND} = 'JSON::PP';
+$ENV{PERL_YAML_BACKEND} = 'CPAN::Meta::YAML';
+
my $opts = {
'META.yml' => { version => '1.4' },
'META.json' => { version => '2' },
--
2.9.2
|
From @karenetheridge0003-always-use-the-core-serializers-in-EUMM-for-core-tes.patchFrom 777e7fe8b691ba4ee738395e2fc3448a7c7c62ba Mon Sep 17 00:00:00 2001
From: Karen Etheridge <ether@cpan.org>
Date: Thu, 18 Aug 2016 12:47:41 -0700
Subject: [PATCH 3/3] always use the core serializers in EUMM for core tests
diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
index 6bff1bf..8c8f801 100644
--- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
+++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
@@ -52,6 +52,7 @@ END
);
# avoid environment variables interfering with our make runs
+delete @ENV{qw(PERL_JSON_BACKEND CPAN_META_JSON_BACKEND PERL_YAML_BACKEND)} if $ENV{PERL_CORE};
delete @ENV{qw(LIB MAKEFLAGS PERL_CORE)};
my $perl = which_perl();
diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t
index 027393c..f1b0f1e 100644
--- a/cpan/ExtUtils-MakeMaker/t/several_authors.t
+++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t
@@ -52,6 +52,7 @@ END
);
# avoid environment variables interfering with our make runs
+delete @ENV{qw(PERL_JSON_BACKEND CPAN_META_JSON_BACKEND PERL_YAML_BACKEND)} if $ENV{PERL_CORE};
delete @ENV{qw(LIB MAKEFLAGS PERL_CORE)};
my $perl = which_perl();
--
2.9.2
|
From @jkeenanOn Thu Aug 18 13:06:30 2016, ether wrote:
I'm certainly willing to apply all 3 in one pass and deal with a few Porting tests as needed, but ... ##### The first patch did not apply cleanly to blead. Thank you very much. |
|
The RT System itself - Status changed from 'new' to 'open' |
From @karenetheridgeOn Thu Aug 18 14:09:01 2016, jkeenan wrote:
As far as I know all porting tests should pass when all three commits are applied. I've regenerated the patch from an updated blead (although I was working with a version from early yesterday, and there were no conflicts in the meantime as far as I know, so I don't know what happened)... |
From @karenetheridge0002-regenerate-META.-using-new-CPAN-Meta-and-always-use-.patchFrom edc02a543d3bd42bfe77fa981e909a0cd2f32d81 Mon Sep 17 00:00:00 2001
From: Karen Etheridge <ether@cpan.org>
Date: Thu, 18 Aug 2016 11:35:11 -0700
Subject: [PATCH 2/3] regenerate META.* using new CPAN::Meta, and always use
the core serializers
diff --git a/META.json b/META.json
index 5458851..aa68709 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"perl5-porters@perl.org"
],
"dynamic_config" : 1,
- "generated_by" : "CPAN::Meta version 2.150005",
+ "generated_by" : "CPAN::Meta version 2.150010",
"license" : [
"perl_5"
],
diff --git a/META.yml b/META.yml
index 1253e9d..25a0777 100644
--- a/META.yml
+++ b/META.yml
@@ -4,7 +4,7 @@ author:
- perl5-porters@perl.org
build_requires: {}
dynamic_config: 1
-generated_by: 'CPAN::Meta version 2.150005, CPAN::Meta::Converter version 2.150005'
+generated_by: 'CPAN::Meta version 2.150010, CPAN::Meta::Converter version 2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/Porting/makemeta b/Porting/makemeta
index cb6944e..9259b20 100644
--- a/Porting/makemeta
+++ b/Porting/makemeta
@@ -8,6 +8,10 @@ use strict;
use warnings;
use Getopt::Std;
+# avoid unnecessary churn in x_serialization_backend in META.*
+$ENV{PERL_JSON_BACKEND} = $ENV{CPAN_META_JSON_BACKEND} = 'JSON::PP';
+$ENV{PERL_YAML_BACKEND} = 'CPAN::Meta::YAML';
+
my $opts = {
'META.yml' => { version => '1.4' },
'META.json' => { version => '2' },
--
2.9.2
|
From @karenetheridge0003-always-use-the-core-serializers-in-EUMM-for-core-tes.patchFrom a8612c71f24e6721166d28ec84fdccad71785d39 Mon Sep 17 00:00:00 2001
From: Karen Etheridge <ether@cpan.org>
Date: Thu, 18 Aug 2016 12:47:41 -0700
Subject: [PATCH 3/3] always use the core serializers in EUMM for core tests
diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
index 6bff1bf..8c8f801 100644
--- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
+++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
@@ -52,6 +52,7 @@ END
);
# avoid environment variables interfering with our make runs
+delete @ENV{qw(PERL_JSON_BACKEND CPAN_META_JSON_BACKEND PERL_YAML_BACKEND)} if $ENV{PERL_CORE};
delete @ENV{qw(LIB MAKEFLAGS PERL_CORE)};
my $perl = which_perl();
diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t
index 027393c..f1b0f1e 100644
--- a/cpan/ExtUtils-MakeMaker/t/several_authors.t
+++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t
@@ -52,6 +52,7 @@ END
);
# avoid environment variables interfering with our make runs
+delete @ENV{qw(PERL_JSON_BACKEND CPAN_META_JSON_BACKEND PERL_YAML_BACKEND)} if $ENV{PERL_CORE};
delete @ENV{qw(LIB MAKEFLAGS PERL_CORE)};
my $perl = which_perl();
--
2.9.2
|
From @jkeenanOn Fri Aug 19 09:53:10 2016, ether wrote:
Well, AFAICT, the 3 new patches posted today were identical to those posted yesterday. But, so as not to delay getting this stuff smoke-tested by blead testers, I went ahead and performed git surgery. For one file, cpan/CPAN-Meta/lib/CPAN/Meta.pm, I extracted the diff for that file from Ether's patch, first tried 'git apply', then, when that also failed, manually entered the changes and saved them as a separate commit (commit c4159eb). Then, when I went to apply the remaining portions of the first of Ether's patches, I had to resort to 'git rm' for cpan/Parse-CPAN-Meta/corpus/BadMETA.yml (commit 72447ef). I'm attaching the "net" git diff of these commits. Please double-check. Thank you very much. -- |
From @karenetheridgeOn Fri Aug 19 17:02:18 2016, jkeenan wrote:
I compared today's blead to my working branch, and the only difference is in many thanks, and sorry you had to do surgery! |
From @jkeenanNo complaints received in four days. Marking ticket Resolved. |
|
@jkeenan - Status changed from 'open' to 'resolved' |
Migrated from rt.perl.org#128987 (status was 'resolved')
Searchable as RT128987$
The text was updated successfully, but these errors were encountered: