diff options
| author | Steve Dower <steve.dower@python.org> | 2019-09-11 16:16:27 +0100 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2019-09-11 16:16:27 +0100 |
| commit | 19f6940cd7fb91246b88e1fbdbce97a02e7f3fa1 (patch) | |
| tree | 983246194856e3b69db2539db29cc129fdeaba26 | |
| parent | aa929273caca2f4e24e3aa9e790272fd4458ad35 (diff) | |
| download | cpython-git-19f6940cd7fb91246b88e1fbdbce97a02e7f3fa1.tar.gz | |
bpo-38114: Do not include pip.ini in Nuget package (GH-15964)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-09-11-15-24-04.bpo-38114.cc0E5E.rst | 1 | ||||
| -rw-r--r-- | PC/layout/support/options.py | 2 | ||||
| -rw-r--r-- | PC/layout/support/pip.py | 11 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Windows/2019-09-11-15-24-04.bpo-38114.cc0E5E.rst b/Misc/NEWS.d/next/Windows/2019-09-11-15-24-04.bpo-38114.cc0E5E.rst new file mode 100644 index 0000000000..5dab8d728e --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-09-11-15-24-04.bpo-38114.cc0E5E.rst @@ -0,0 +1 @@ +The ``pip.ini`` is no longer included in the Nuget package. diff --git a/PC/layout/support/options.py b/PC/layout/support/options.py index c8ae4e30a8..5e1543b59c 100644 --- a/PC/layout/support/options.py +++ b/PC/layout/support/options.py @@ -17,6 +17,7 @@ def public(f): OPTIONS = { "stable": {"help": "stable ABI stub"}, "pip": {"help": "pip"}, + "pip-user": {"help": "pip.ini file for default --user"}, "distutils": {"help": "distutils"}, "tcltk": {"help": "Tcl, Tk and tkinter"}, "idle": {"help": "Idle"}, @@ -42,6 +43,7 @@ PRESETS = { "options": [ "stable", "pip", + "pip-user", "distutils", "tcltk", "idle", diff --git a/PC/layout/support/pip.py b/PC/layout/support/pip.py index 4ad3b1dd5b..c54acb250a 100644 --- a/PC/layout/support/pip.py +++ b/PC/layout/support/pip.py @@ -33,11 +33,12 @@ def get_pip_layout(ns): pkg_root = "packages/{}" if ns.zip_lib else "Lib/site-packages/{}" for dest, src in rglob(pip_dir, "**/*"): yield pkg_root.format(dest), src - content = "\n".join( - "[{}]\nuser=yes".format(n) - for n in ["install", "uninstall", "freeze", "list"] - ) - yield "pip.ini", ("pip.ini", content.encode()) + if ns.include_pip_user: + content = "\n".join( + "[{}]\nuser=yes".format(n) + for n in ["install", "uninstall", "freeze", "list"] + ) + yield "pip.ini", ("pip.ini", content.encode()) def extract_pip_files(ns): |