MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-57583 Update bundled virtualenv zipapp

Browse Source 
20.13.0 -> left unchanged for python2
20.13.0 -> 20.16.7 for all else

GitOrigin-RevId: 9fb642976cd274386ad5d978f818227b86ca3cd8
This commit is contained in:
lada.gagina
2022-11-25 18:46:54 +01:00
committed by intellij-monorepo-bot
parent afdb125a10
commit 3982fb30fe
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
python/helpers/virtualenv.pyz → python/helpers/virtualenv-20.13.0.pyz
View File

BIN
python/helpers/virtualenv-20.16.7.pyz Normal file
View File

Binary file not shown.

3
python/src/com/jetbrains/python/PythonHelper.java
View File

@@ -27,7 +27,8 @@ public enum PythonHelper implements HelperPackage {
// Packaging tools // Packaging tools
PACKAGING_TOOL("packaging_tool.py"), PACKAGING_TOOL("packaging_tool.py"),
VIRTUALENV_ZIPAPP("virtualenv.pyz"), VIRTUALENV_ZIPAPP("virtualenv-20.16.7.pyz"),
PY2_VIRTUALENV_ZIPAPP("virtualenv-20.13.0.pyz"),
COVERAGEPY("coveragepy", ""), COVERAGEPY("coveragepy", ""),
COVERAGE("coverage_runner", "run_coverage"), COVERAGE("coverage_runner", "run_coverage"),

7
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
View File

@@ -37,7 +37,8 @@ import static com.jetbrains.python.sdk.PySdkExtKt.showSdkExecutionException;
*/ */
@Deprecated @Deprecated
public class PyPackageManagerImpl extends PyPackageManagerImplBase { public class PyPackageManagerImpl extends PyPackageManagerImplBase {
private static final String VIRTUALENV_ZIPAPP_NAME = "virtualenv.pyz"; private static final String VIRTUALENV_ZIPAPP_NAME = "virtualenv-20.16.7.pyz";
private static final String PY2_VIRTUALENV_ZIPAPP_NAME = "virtualenv-20.13.0.pyz";
private static final Logger LOG = Logger.getInstance(PyPackageManagerImpl.class); private static final Logger LOG = Logger.getInstance(PyPackageManagerImpl.class);
@@ -188,7 +189,9 @@ public class PyPackageManagerImpl extends PyPackageManagerImplBase {
args.add(destinationDir); args.add(destinationDir);
try { try {
getPythonProcessResult(Objects.requireNonNull(getHelperPath(VIRTUALENV_ZIPAPP_NAME)), args, false, true, null, List.of("-S")); getPythonProcessResult(
Objects.requireNonNull(getHelperPath(languageLevel.isPython2() ? PY2_VIRTUALENV_ZIPAPP_NAME : VIRTUALENV_ZIPAPP_NAME)),
args, false, true, null, List.of("-S"));
} }
catch (ExecutionException e) { catch (ExecutionException e) {
showSdkExecutionException(sdk, e, PySdkBundle.message("python.creating.venv.failed.title")); showSdkExecutionException(sdk, e, PySdkBundle.message("python.creating.venv.failed.title"));

5
python/src/com/jetbrains/python/packaging/PyTargetEnvironmentPackageManager.java
View File

@@ -230,8 +230,9 @@ public class PyTargetEnvironmentPackageManager extends PyPackageManagerImplBase
HelpersAwareTargetEnvironmentRequest helpersAwareTargetRequest = getPythonTargetInterpreter(); HelpersAwareTargetEnvironmentRequest helpersAwareTargetRequest = getPythonTargetInterpreter();
TargetEnvironmentRequest targetEnvironmentRequest = helpersAwareTargetRequest.getTargetEnvironmentRequest(); TargetEnvironmentRequest targetEnvironmentRequest = helpersAwareTargetRequest.getTargetEnvironmentRequest();
PythonScriptExecution pythonExecution = PythonScriptExecution pythonExecution = PythonScripts.prepareHelperScriptExecution(
PythonScripts.prepareHelperScriptExecution(PythonHelper.VIRTUALENV_ZIPAPP, helpersAwareTargetRequest); languageLevel.isPython2() ? PythonHelper.PY2_VIRTUALENV_ZIPAPP : PythonHelper.VIRTUALENV_ZIPAPP,
helpersAwareTargetRequest);
if (useGlobalSite) { if (useGlobalSite) {
pythonExecution.addParameter("--system-site-packages"); pythonExecution.addParameter("--system-site-packages");
} }