Skip to content

bpo-37672: Switch Windows Store package to use pip.ini for user mode #14939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 1 commit into from
Jul 24, 2019
Merged

bpo-37672: Switch Windows Store package to use pip.ini for user mode #14939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2019-07-24-14-36-28.bpo-37672.uKEVHN.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Switch Windows Store package's pip to use bundled :file:`pip.ini` instead of
:envvar:`PIP_USER` variable.
2 changes: 1 addition & 1 deletion PC/layout/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def _c(d):

if ns.include_pip:
for dest, src in get_pip_layout(ns):
if isinstance(src, tuple) or not (
if not isinstance(src, tuple) and (
src in EXCLUDE_FROM_LIB or src in EXCLUDE_FROM_PACKAGED_LIB
):
continue
Expand Down
6 changes: 5 additions & 1 deletion PC/layout/support/pip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ 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
yield "pip.ini", ("pip.ini", b"[global]\nuser=yes")
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):
Expand Down
75 changes: 42 additions & 33 deletions PC/python_uwp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ set_process_name(PyConfig *config)
break;
}
}
size_t i = executable.find_last_of(L"/\\");
if (i == std::wstring::npos) {
executable = PROGNAME;
} else {
executable.replace(i + 1, std::wstring::npos, PROGNAME);
}
}

if (!home.empty()) {
Expand Down Expand Up @@ -163,10 +169,29 @@ wmain(int argc, wchar_t **argv)
PyPreConfig preconfig;
PyConfig config;

const wchar_t *moduleName = NULL;
const wchar_t *p = wcsrchr(argv[0], L'\\');
if (!p) {
p = argv[0];
}
if (p) {
if (*p == L'\\') {
p++;
}

if (wcsnicmp(p, L"pip", 3) == 0) {
moduleName = L"pip";
} else if (wcsnicmp(p, L"idle", 4) == 0) {
moduleName = L"idlelib";
}
}

PyPreConfig_InitPythonConfig(&preconfig);
status = Py_PreInitializeFromArgs(&preconfig, argc, argv);
if (PyStatus_Exception(status)) {
goto fail_without_config;
if (!moduleName) {
status = Py_PreInitializeFromArgs(&preconfig, argc, argv);
if (PyStatus_Exception(status)) {
goto fail_without_config;
}
}

status = PyConfig_InitPythonConfig(&config);
Expand All @@ -178,48 +203,32 @@ wmain(int argc, wchar_t **argv)
if (PyStatus_Exception(status)) {
goto fail;
}
if (moduleName) {
config.parse_argv = 0;
}

status = set_process_name(&config);
if (PyStatus_Exception(status)) {
goto fail;
}

const wchar_t *p = _wgetenv(L"PYTHONUSERBASE");
p = _wgetenv(L"PYTHONUSERBASE");
if (!p || !*p) {
_wputenv_s(L"PYTHONUSERBASE", get_user_base().c_str());
}

p = wcsrchr(argv[0], L'\\');
if (!p) {
p = argv[0];
}
if (p) {
if (*p == L'\\') {
p++;
if (moduleName) {
status = PyConfig_SetString(&config, &config.run_module, moduleName);
if (PyStatus_Exception(status)) {
goto fail;
}

const wchar_t *moduleName = NULL;
if (wcsnicmp(p, L"pip", 3) == 0) {
moduleName = L"pip";
/* No longer required when pip 19.1 is added */
_wputenv_s(L"PIP_USER", L"true");
} else if (wcsnicmp(p, L"idle", 4) == 0) {
moduleName = L"idlelib";
status = PyConfig_SetString(&config, &config.run_filename, NULL);
if (PyStatus_Exception(status)) {
goto fail;
}

if (moduleName) {
status = PyConfig_SetString(&config, &config.run_module, moduleName);
if (PyStatus_Exception(status)) {
goto fail;
}
status = PyConfig_SetString(&config, &config.run_filename, NULL);
if (PyStatus_Exception(status)) {
goto fail;
}
status = PyConfig_SetString(&config, &config.run_command, NULL);
if (PyStatus_Exception(status)) {
goto fail;
}
status = PyConfig_SetString(&config, &config.run_command, NULL);
if (PyStatus_Exception(status)) {
goto fail;
}
}

Expand Down