https://github.com/python/cpython/commit/3e78c7c30553baf72b7eb6fe3384d88fff5... commit: 3e78c7c30553baf72b7eb6fe3384d88fff549906 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> committer: Steve Dower <steve.dower@microsoft.com> date: 2019-03-30T14:47:12-07:00 summary: bpo-36010: Add venv to the nuget distribution (GH-12367) (cherry picked from commit e724152796a5a41544f52054506c6c2248242a5d) Co-authored-by: Paul Moore <p.f.moore@gmail.com> files: A Misc/NEWS.d/next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst M PC/layout/support/options.py M Tools/nuget/make_pkg.proj diff --git a/Misc/NEWS.d/next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst b/Misc/NEWS.d/next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst new file mode 100644 index 000000000000..32c57c49ae41 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst @@ -0,0 +1 @@ +Add the venv standard library module to the nuget distribution for Windows. \ No newline at end of file diff --git a/PC/layout/support/options.py b/PC/layout/support/options.py index 76d9e34e1f46..22492f220d60 100644 --- a/PC/layout/support/options.py +++ b/PC/layout/support/options.py @@ -53,7 +53,15 @@ def public(f): }, "nuget": { "help": "nuget package", - "options": ["stable", "pip", "distutils", "dev", "props"], + "options": [ + "dev", + "tools", + "pip", + "stable", + "distutils", + "venv", + "props" + ], }, "default": { "help": "development kit package", diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index e093a6d0bd76..5638952ac9f9 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -28,7 +28,7 @@ <PythonArguments>$(PythonArguments) -b "$(BuildPath.TrimEnd(`\`))" -s "$(PySourcePath.TrimEnd(`\`))"</PythonArguments> <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)obj"</PythonArguments> <PythonArguments>$(PythonArguments) --copy "$(IntermediateOutputPath)pkg"</PythonArguments> - <PythonArguments>$(PythonArguments) --include-dev --include-tools --include-pip --include-stable --include-launcher --include-props</PythonArguments> + <PythonArguments>$(PythonArguments) --preset-nuget</PythonArguments> <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages)</PackageArguments>