https://github.com/python/cpython/commit/1bbb81b251bcc8b05e0cd33cd36aef55481... commit: 1bbb81b251bcc8b05e0cd33cd36aef55481b13db branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> committer: GitHub <noreply@github.com> date: 2020-02-25T12:24:48-08:00 summary: bpo-38403: Update nuspec file for deprecated field and git repository (GH-18657) (cherry picked from commit d6448919702142123d937a54f20a81aeaf8d2acc) Co-authored-by: Steve Dower <steve.dower@python.org> files: A Misc/NEWS.d/next/Windows/2020-02-25-18-43-34.bpo-34803.S3VcS0.rst A PC/icons/logo.svg A PC/icons/logox128.png M PC/layout/support/nuspec.py diff --git a/Misc/NEWS.d/next/Windows/2020-02-25-18-43-34.bpo-34803.S3VcS0.rst b/Misc/NEWS.d/next/Windows/2020-02-25-18-43-34.bpo-34803.S3VcS0.rst new file mode 100644 index 0000000000000..144ffd50af0e9 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-02-25-18-43-34.bpo-34803.S3VcS0.rst @@ -0,0 +1,2 @@ +Package for nuget.org now includes repository reference and bundled icon +image. diff --git a/PC/icons/logo.svg b/PC/icons/logo.svg new file mode 100644 index 0000000000000..6f521503a3832 --- /dev/null +++ b/PC/icons/logo.svg @@ -0,0 +1 @@ +<svg width="238" height="237" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" overflow="hidden"><defs><clipPath id="clip0"><path d="M706-314 944-314 944-77 706-77Z" fill-rule="evenodd" clip-rule="evenodd"/></clipPath></defs><g clip-path="url(#clip0)" transform="translate(-706 314)"><path d="M792.441-295.763C786.496-295.763 781.697-290.979 781.697-285.062 781.697-279.166 786.496-274.382 792.441-274.382 798.365-274.382 803.184-279.166 803.184-285.062 803.184-290.979 798.365-295.763 792.441-295.763ZM823.472-312.998C833.277-313.043 843.484-312.329 853.336-310.724 868.899-308.185 882-296.728 882-281.516L882-228.072C882-212.398 869.282-199.557 853.336-199.557L796.03-199.557C776.58-199.557 760.189-183.169 760.189-164.641L760.189-139 740.485-139C723.817-139 714.114-150.877 710.037-167.494 704.538-189.82 704.772-203.124 710.037-224.505 714.602-243.159 729.189-253 745.857-253L767.365-253 824.693-253 824.693-260.134 767.365-260.134 767.365-281.516C767.365-297.715 771.76-306.527 796.03-310.724 804.268-312.151 813.668-312.953 823.472-312.998Z" fill="#366A96" fill-rule="evenodd"/><path d="M857.377-117.071C851.466-117.071 846.655-112.267 846.655-106.348 846.655-100.406 851.466-95.6026 857.377-95.6026 863.31-95.6026 868.099-100.406 868.099-106.348 868.099-112.267 863.31-117.071 857.377-117.071ZM889.563-253 911.007-253C927.662-253 935.502-240.696 939.614-224.39 945.334-201.743 945.589-184.804 939.614-167.148 933.828-150 927.642-138.539 911.007-138.539L882.402-138.539 825.211-138.539 825.211-131.375 882.402-131.375 882.402-109.908C882.402-93.6435 868.205-85.4055 853.796-81.2973 832.12-75.1034 814.722-76.0513 796.606-81.2973 781.476-85.6801 768-94.6332 768-109.908L768-163.568C768-179.01 780.947-192.199 796.606-192.199L853.796-192.199C872.846-192.199 889.563-208.568 889.563-227.971Z" fill="#FFC836" fill-rule="evenodd"/></g></svg> \ No newline at end of file diff --git a/PC/icons/logox128.png b/PC/icons/logox128.png new file mode 100644 index 0000000000000..d2655c72e7df4 Binary files /dev/null and b/PC/icons/logox128.png differ diff --git a/PC/layout/support/nuspec.py b/PC/layout/support/nuspec.py index b85095c555fe0..9c6a9a9159509 100644 --- a/PC/layout/support/nuspec.py +++ b/PC/layout/support/nuspec.py @@ -3,6 +3,7 @@ """ import os +import sys from .constants import * @@ -14,6 +15,7 @@ "PYTHON_TAG": VER_DOT, "PYTHON_VERSION": os.getenv("PYTHON_NUSPEC_VERSION"), "FILELIST": r' <file src="**\*" target="tools" />', + "GIT": sys._git, } NUSPEC_PLATFORM_DATA = dict( @@ -42,10 +44,13 @@ <license type="file">tools\LICENSE.txt</license> <projectUrl>https://www.python.org/</projectUrl> <description>Installs {PYTHON_BITNESS} Python for use in build scenarios.</description> + <icon>images\logox128.png</icon> <iconUrl>https://www.python.org/static/favicon.ico</iconUrl> <tags>python</tags> + <repository type="git" url="https://github.com/Python/CPython.git" commit="{GIT[2]}" /> </metadata> <files> + <file src="{LOGO}" target="images" /> {FILELIST} </files> </package> @@ -68,5 +73,6 @@ def get_nuspec_layout(ns): data[k] = v if ns.include_all or ns.include_props: data["FILELIST"] = FILELIST_WITH_PROPS + data["LOGO"] = ns.source / "PC" / "icons" / "logox128.png" nuspec = NUSPEC_TEMPLATE.format_map(data) yield "python.nuspec", ("python.nuspec", nuspec.encode("utf-8"))