MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] PY-84498 fix CNEs, add tests, and fix the issue to make these tests runnable.

Browse Source 
GitOrigin-RevId: a9d9d14750174c85a75049a2020b179977d6d4dc
This commit is contained in:
Vladimir.Koshelev
2025-09-30 18:46:16 +00:00
committed by intellij-monorepo-bot
parent 7b115dbd43
commit 497622b4c8
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
-1
View File
@@ -41,7 +41,6 @@ object PythonCommunityPluginModules {
// required for "Python Console" in PythonCore plugin
@Suppress("SpellCheckingInspection")
spec.withProjectLibrary("libthrift")
spec.excludeProjectLibrary("Gradle")
body(spec)
}
platform/testFramework/teamCity/intellij.platform.testFramework.teamCity.iml
+1
View File
@@ -3,6 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.platform.testFramework.teamCity" />
</content>
<orderEntry type="inheritedJdk" />
platform/testFramework/teamCity/resources/intellij.platform.testFramework.teamCity.xml
+2
View File
@@ -0,0 +1,2 @@
<idea-plugin>
</idea-plugin>
python/intellij.python.community.impl.iml
+1 -1
View File
@@ -121,7 +121,7 @@
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="module" module-name="intellij.toml" />
<orderEntry type="module" module-name="intellij.toml.core" />
<orderEntry type="library" name="tuweni-toml" level="project" />
<orderEntry type="library" scope="PROVIDED" name="tuweni-toml" level="project" />
<orderEntry type="library" name="jsr305" level="project" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
python/pluginCore/plugin-content.yaml
+7 -8
View File
@@ -1,8 +1,3 @@
- name: lib/libthrift.jar
library: libthrift
files:
- name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar
reason: withProjectLibrary
- name: lib/modules/intellij.platform.ide.nonModalWelcomeScreen.jar
contentModules:
- name: intellij.platform.ide.nonModalWelcomeScreen
@@ -53,10 +48,9 @@
- name: $MAVEN_REPOSITORY$/it/krzeminski/snakeyaml-engine-kmp-jvm/3/snakeyaml-engine-kmp-jvm-3.jar
- name: $MAVEN_REPOSITORY$/net/thauvin/erik/urlencoder/urlencoder-lib-jvm/1/urlencoder-lib-jvm-1.jar
reason: <- intellij.python.community.impl
- name: tuweni-toml
- name: libthrift
files:
- name: $MAVEN_REPOSITORY$/io/consensys/tuweni/tuweni-toml/2/tuweni-toml-2.jar
- name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar
- name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar
reason: <- intellij.python.community.impl
contentModules:
- name: intellij.python.community.impl
@@ -137,6 +131,11 @@
- name: lib/modules/intellij.python.pyproject.jar
contentModules:
- name: intellij.python.pyproject
library: tuweni-toml
files:
- name: $MAVEN_REPOSITORY$/io/consensys/tuweni/tuweni-toml/2/tuweni-toml-2.jar
- name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar
reason: <- intellij.python.pyproject
- name: lib/modules/intellij.python.sdk.jar
contentModules:
- name: intellij.python.sdk
python/python-pyproject/intellij.python.pyproject.iml
+1 -1
View File
@@ -17,7 +17,7 @@
<orderEntry type="module" module-name="intellij.python.sdk" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.toml.core" />
<orderEntry type="library" scope="PROVIDED" name="tuweni-toml" level="project" />
<orderEntry type="library" name="tuweni-toml" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
</component>
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
+2 -1
View File
@@ -1347,7 +1347,8 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
myConsoleSettings = consoleSettings;
myWorkingDir = workingDir;
mySdk = sdk;
myEnvironmentVariables = envs;
myEnvironmentVariables = new HashMap<>();
myEnvironmentVariables.putAll(envs);
myEnvironmentVariables.putAll(consoleSettings.getEnvs());
myEnvFiles = consoleSettings.myEnvFiles;
PyDebuggerSettings debuggerSettings = PyDebuggerSettings.getInstance();