bpo-36174: Update nuget authoring for new license field. (GH-12300)

diff --git a/Tools/nuget/make_zip.py b/Tools/nuget/make_zip.py
index 20fadf2dda4369e8ee68ad9918f8508b12826661..8844cacb096e9c20778cfb80e28bc2a8fff94d8b 100644 (file)
--- a/Tools/nuget/make_zip.py
+++ b/Tools/nuget/make_zip.py
@@ -103,6 +103,7 @@ FULL_LAYOUT = [
     ('Lib/', 'Lib', '**/*', include_in_lib),
     ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs),
     ('Tools/', 'Tools', '**/*', include_in_tools),
+    ('/', '', 'LICENSE', None),
 ]
 
 EMBED_LAYOUT = [

diff --git a/Tools/nuget/python2.nuspec b/Tools/nuget/python2.nuspec
index 7c1a63db4e6f945e086463e715e4ecb5621694ac..d5e1e8b757173dbaf51fa5689aeaecc60cce55dc 100644 (file)
--- a/Tools/nuget/python2.nuspec
+++ b/Tools/nuget/python2.nuspec
@@ -5,9 +5,8 @@
     <title>Python 2.7</title>
     <version>0.0.0.0</version>
     <authors>Python Software Foundation</authors>
-    <licenseUrl>https://docs.python.org/2.7/license.html</licenseUrl>
+    <license type="file">tools\LICENSE</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 64-bit Python 2.7 for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>

diff --git a/Tools/nuget/python2x86.nuspec b/Tools/nuget/python2x86.nuspec
index 6f433217054acfbce55eeea17f5dec87a9792495..ff12ac226c7198a202069e0ec7e638c72d83e19a 100644 (file)
--- a/Tools/nuget/python2x86.nuspec
+++ b/Tools/nuget/python2x86.nuspec
@@ -5,9 +5,8 @@
     <title>Python 2.7 (32-bit)</title>
     <authors>Python Software Foundation</authors>
     <version>0.0.0.0</version>
-    <licenseUrl>https://docs.python.org/2.7/license.html</licenseUrl>
+    <license type="file">tools\LICENSE</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 32-bit Python 2.7 for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>