[Python-checkins] cpython (merge 3.5 -> 3.6): Includes ensurepip and venv packages in nuget package.

[steve.dower]

https://hg.python.org/cpython/rev/9c325166ba5f
changeset:   106452:9c325166ba5f
branch:      3.6
parent:      106449:844ce25a0617
parent:      106451:dc4bcc4bc8c6
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Feb 06 14:12:19 2017 -0800
summary:
  Includes ensurepip and venv packages in nuget package.

files:
  Tools/msi/make_zip.py |  13 +++++++++++--
  1 files changed, 11 insertions(+), 2 deletions(-)


diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -29,12 +29,15 @@
 
 EXCLUDE_FROM_LIBRARY = {
     '__pycache__',
-    'ensurepip',
     'idlelib',
     'pydoc_data',
     'site-packages',
     'tkinter',
     'turtledemo',
+}
+
+EXCLUDE_FROM_EMBEDDABLE_LIBRARY = {
+    'ensurepip',
     'venv',
 }
 
@@ -82,6 +85,12 @@
     suffix = p.suffix.lower()
     return suffix not in {'.pyc', '.pyo', '.exe'}
 
+def include_in_embeddable_lib(p):
+    if p.is_dir() and p.name.lower() in EXCLUDE_FROM_EMBEDDABLE_LIBRARY:
+        return False
+
+    return include_in_lib(p)
+
 def include_in_libs(p):
     if not is_not_debug(p):
         return False
@@ -114,7 +123,7 @@
     ('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),
     ('/', 'PCBuild/$arch', '*.pyd', is_not_debug),
     ('/', 'PCBuild/$arch', '*.dll', is_not_debug),
-    ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_lib),
+    ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_embeddable_lib),
 ]
 
 if os.getenv('DOC_FILENAME'):

-- 
Repository URL: https://hg.python.org/cpython