mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-38114: Do not include pip.ini in Nuget package (GH-15964)

Browse source
This commit is contained in:
Steve Dower 2019-09-11 16:16:27 +01:00 • committed by Zachary Ware
parent aa929273ca
commit 19f6940cd7
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2019-09-11-15-24-04.bpo-38114.cc0E5E.rst Normal file
View file

@ -0,0 +1 @@
The ``pip.ini`` is no longer included in the Nuget package.

2
PC/layout/support/options.py
View file

@ -17,6 +17,7 @@ def public(f):
OPTIONS = { OPTIONS = {
"stable": {"help": "stable ABI stub"}, "stable": {"help": "stable ABI stub"},
"pip": {"help": "pip"}, "pip": {"help": "pip"},
"pip-user": {"help": "pip.ini file for default --user"},
"distutils": {"help": "distutils"}, "distutils": {"help": "distutils"},
"tcltk": {"help": "Tcl, Tk and tkinter"}, "tcltk": {"help": "Tcl, Tk and tkinter"},
"idle": {"help": "Idle"}, "idle": {"help": "Idle"},
@ -42,6 +43,7 @@ PRESETS = {
"options": [ "options": [
"stable", "stable",
"pip", "pip",
"pip-user",
"distutils", "distutils",
"tcltk", "tcltk",
"idle", "idle",

11
PC/layout/support/pip.py
View file

@ -33,11 +33,12 @@ def get_pip_layout(ns):
pkg_root = "packages/{}" if ns.zip_lib else "Lib/site-packages/{}" pkg_root = "packages/{}" if ns.zip_lib else "Lib/site-packages/{}"
for dest, src in rglob(pip_dir, "**/*"): for dest, src in rglob(pip_dir, "**/*"):
yield pkg_root.format(dest), src yield pkg_root.format(dest), src
content = "\n".join( if ns.include_pip_user:
"[{}]\nuser=yes".format(n) content = "\n".join(
for n in ["install", "uninstall", "freeze", "list"] "[{}]\nuser=yes".format(n)
) for n in ["install", "uninstall", "freeze", "list"]
yield "pip.ini", ("pip.ini", content.encode()) )
yield "pip.ini", ("pip.ini", content.encode())
def extract_pip_files(ns): def extract_pip_files(ns):