From e724152796a5a41544f52054506c6c2248242a5d Mon Sep 17 00:00:00 2001
From: Paul Moore
Date: Sat, 30 Mar 2019 16:32:05 +0000
Subject: bpo-36010: Add venv to the nuget distribution (GH-12367)
---
.../next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst | 1 +
PC/layout/support/options.py | 10 +++++++++-
Tools/nuget/make_pkg.proj | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Windows/2019-03-16-10-24-58.bpo-36010.dttWfp.rst
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 0000000..32c57c4
--- /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 76d9e34..22492f2 100644
--- a/PC/layout/support/options.py
+++ b/PC/layout/support/options.py
@@ -53,7 +53,15 @@ PRESETS = {
},
"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 e093a6d..5638952 100644
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -28,7 +28,7 @@
$(PythonArguments) -b "$(BuildPath.TrimEnd(`\`))" -s "$(PySourcePath.TrimEnd(`\`))"
$(PythonArguments) -t "$(IntermediateOutputPath)obj"
$(PythonArguments) --copy "$(IntermediateOutputPath)pkg"
- $(PythonArguments) --include-dev --include-tools --include-pip --include-stable --include-launcher --include-props
+ $(PythonArguments) --preset-nuget
"$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages)
--
cgit v0.12