From aa250154f9e43776b94186de40144bad9c13ab9b Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Tue, 23 Sep 2025 22:56:41 +0200 Subject: [PATCH] [python] Add intellij.libraries.system.stubs.jupiter to dependencies in intellij.python.community.junit5Tests.framework._test module (IJPL-116621) Also adds intellij.libraries.system.stubs.jupiter module. GitOrigin-RevId: 20883f15397dfe00462bf70b0e14d12357962334 --- .idea/modules.xml | 1 + build/bazel-generated-file-list.txt | 1 + lib/BUILD.bazel | 56 ++++++++----- lib/MODULE.bazel | 84 ++++++++++++------- libraries/system-stubs-jupiter/BUILD.bazel | 20 +++++ ...ntellij.libraries.system.stubs.jupiter.iml | 45 ++++++++++ ...ntellij.libraries.system.stubs.jupiter.xml | 5 ++ python/junit5Tests-framework/BUILD.bazel | 17 ++-- ...python.community.junit5Tests.framework.iml | 39 ++------- ....community.junit5Tests.framework._test.xml | 1 + 10 files changed, 178 insertions(+), 91 deletions(-) create mode 100644 libraries/system-stubs-jupiter/BUILD.bazel create mode 100644 libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml create mode 100644 libraries/system-stubs-jupiter/resources/intellij.libraries.system.stubs.jupiter.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index 90677a110f04..e6beeecda0c8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -647,6 +647,7 @@ + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 58a269536da5..3b7ba9ac12c8 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -365,6 +365,7 @@ libraries/lucene.common libraries/microba libraries/mockito libraries/skiko +libraries/system-stubs-jupiter libraries/testcontainers libraries/testng libraries/xerces diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 34d37c767c93..a2d59a5400c2 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -5002,6 +5002,41 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "libraries-system-stubs-jupiter-uk-webcompere-system-stubs-jupiter", + exports = [ + ":system-stubs-jupiter-2_1_8_http_import", + ":system-stubs-core-2_1_8_http_import", + ":byte-buddy-1_17_4_http_import", + ":byte-buddy-agent-1_17_4_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "system-stubs-jupiter-2_1_8_http_import", + jar = "@system-stubs-jupiter-2_1_8_http//file", + source_jar = "@system-stubs-jupiter-2_1_8-sources_http//file" +) + +jvm_import( + name = "system-stubs-core-2_1_8_http_import", + jar = "@system-stubs-core-2_1_8_http//file", + source_jar = "@system-stubs-core-2_1_8-sources_http//file" +) + +jvm_import( + name = "byte-buddy-1_17_4_http_import", + jar = "@byte-buddy-1_17_4_http//file", + source_jar = "@byte-buddy-1_17_4-sources_http//file" +) + +jvm_import( + name = "byte-buddy-agent-1_17_4_http_import", + jar = "@byte-buddy-agent-1_17_4_http//file", + source_jar = "@byte-buddy-agent-1_17_4-sources_http//file" +) + jvm_import( name = "libraries-xerces-_xerces", jar = "@xercesImpl-2_12_2_http//file", @@ -8790,27 +8825,6 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( - name = "python-community-junit5_tests-framework-uk-webcompere-system-stubs-jupiter", - exports = [ - ":system-stubs-jupiter-2_1_8_http_import", - ":system-stubs-core-2_1_8_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "system-stubs-jupiter-2_1_8_http_import", - jar = "@system-stubs-jupiter-2_1_8_http//file", - source_jar = "@system-stubs-jupiter-2_1_8-sources_http//file" -) - -jvm_import( - name = "system-stubs-core-2_1_8_http_import", - jar = "@system-stubs-core-2_1_8_http//file", - source_jar = "@system-stubs-core-2_1_8-sources_http//file" -) - jvm_import( name = "python-ml-features-jetbrains-ml-models-python-imports-ranking-model", jar = "@python-imports-ranking-model-coral-panda-republished-4_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 92208a21321e..211b26f7406f 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -7132,6 +7132,62 @@ http_file( downloaded_file_path = "skiko-awt-runtime-all-0.9.22-sources.jar" ) +http_file( + name = "system-stubs-jupiter-2_1_8_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8.jar", + sha256 = "9a24867a51f5d22db67d9052a06bc5dd2e9a3e273bc2ee9814620f2d9f25d0a8", + downloaded_file_path = "system-stubs-jupiter-2.1.8.jar" +) + +http_file( + name = "system-stubs-core-2_1_8_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8.jar", + sha256 = "9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1", + downloaded_file_path = "system-stubs-core-2.1.8.jar" +) + +http_file( + name = "byte-buddy-1_17_4_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4.jar", + sha256 = "74768731219a5b2e0cc9d2b1c9e2092e0622242e41b1925a6ba7346e160731bc", + downloaded_file_path = "byte-buddy-1.17.4.jar" +) + +http_file( + name = "byte-buddy-agent-1_17_4_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4.jar", + sha256 = "e1dae7efc5562c29ad3b625b90e6864208de69bad5632c3f93a547f17622ac51", + downloaded_file_path = "byte-buddy-agent-1.17.4.jar" +) + +http_file( + name = "system-stubs-jupiter-2_1_8-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8-sources.jar", + sha256 = "208bfe2907ab022fe206402f2ef6b1ea445f8240f072a14a49e338c1448fb2b6", + downloaded_file_path = "system-stubs-jupiter-2.1.8-sources.jar" +) + +http_file( + name = "system-stubs-core-2_1_8-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8-sources.jar", + sha256 = "6e6c4adf9094e0200400a5d9f8086c8a1c4a0940919fe0b30d30543b483d5687", + downloaded_file_path = "system-stubs-core-2.1.8-sources.jar" +) + +http_file( + name = "byte-buddy-1_17_4-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4-sources.jar", + sha256 = "ea0286512984db5473f6573bc84030a5d1eab4dbaecf3ffde0b8827d967316f8", + downloaded_file_path = "byte-buddy-1.17.4-sources.jar" +) + +http_file( + name = "byte-buddy-agent-1_17_4-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4-sources.jar", + sha256 = "57b0ee93eab8caa3cfc424aa24616462543bb2a7f13848cbb537c225314dffaf", + downloaded_file_path = "byte-buddy-agent-1.17.4-sources.jar" +) + http_file( name = "xercesImpl-2_12_2_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar", @@ -12781,34 +12837,6 @@ http_file( downloaded_file_path = "ml-completion-prev-exprs-models-1.11.jar" ) -http_file( - name = "system-stubs-jupiter-2_1_8_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8.jar", - sha256 = "9a24867a51f5d22db67d9052a06bc5dd2e9a3e273bc2ee9814620f2d9f25d0a8", - downloaded_file_path = "system-stubs-jupiter-2.1.8.jar" -) - -http_file( - name = "system-stubs-core-2_1_8_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8.jar", - sha256 = "9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1", - downloaded_file_path = "system-stubs-core-2.1.8.jar" -) - -http_file( - name = "system-stubs-jupiter-2_1_8-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8-sources.jar", - sha256 = "208bfe2907ab022fe206402f2ef6b1ea445f8240f072a14a49e338c1448fb2b6", - downloaded_file_path = "system-stubs-jupiter-2.1.8-sources.jar" -) - -http_file( - name = "system-stubs-core-2_1_8-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8-sources.jar", - sha256 = "6e6c4adf9094e0200400a5d9f8086c8a1c4a0940919fe0b30d30543b483d5687", - downloaded_file_path = "system-stubs-core-2.1.8-sources.jar" -) - http_file( name = "python-imports-ranking-model-coral-panda-republished-4_http", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/ml/models/python-imports-ranking-model/coral-panda-republished-4/python-imports-ranking-model-coral-panda-republished-4.jar", diff --git a/libraries/system-stubs-jupiter/BUILD.bazel b/libraries/system-stubs-jupiter/BUILD.bazel new file mode 100644 index 000000000000..9b9c6e5fe8f5 --- /dev/null +++ b/libraries/system-stubs-jupiter/BUILD.bazel @@ -0,0 +1,20 @@ +### auto-generated section `build intellij.libraries.system.stubs.jupiter` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "system-stubs-jupiter_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "system-stubs-jupiter", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + exports = ["@lib//:libraries-system-stubs-jupiter-uk-webcompere-system-stubs-jupiter"], + runtime_deps = [ + ":system-stubs-jupiter_resources", + "//libraries/junit5", + ] +) +### auto-generated section `build intellij.libraries.system.stubs.jupiter` end \ No newline at end of file diff --git a/libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml b/libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml new file mode 100644 index 000000000000..2b6d3afb0213 --- /dev/null +++ b/libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + 9a24867a51f5d22db67d9052a06bc5dd2e9a3e273bc2ee9814620f2d9f25d0a8 + + + 9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1 + + + 74768731219a5b2e0cc9d2b1c9e2092e0622242e41b1925a6ba7346e160731bc + + + e1dae7efc5562c29ad3b625b90e6864208de69bad5632c3f93a547f17622ac51 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/system-stubs-jupiter/resources/intellij.libraries.system.stubs.jupiter.xml b/libraries/system-stubs-jupiter/resources/intellij.libraries.system.stubs.jupiter.xml new file mode 100644 index 000000000000..d5a878e1d3ff --- /dev/null +++ b/libraries/system-stubs-jupiter/resources/intellij.libraries.system.stubs.jupiter.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/python/junit5Tests-framework/BUILD.bazel b/python/junit5Tests-framework/BUILD.bazel index ace0ccae44cf..46adc6677249 100644 --- a/python/junit5Tests-framework/BUILD.bazel +++ b/python/junit5Tests-framework/BUILD.bazel @@ -32,9 +32,13 @@ jvm_library( "@lib//:testcontainers-junit-jupiter", "//wintools", "//wintools:wintools_test_lib", + "//libraries/system-stubs-jupiter", "//libraries/testcontainers", "//platform/analysis-api:analysis", + "//platform/analysis-impl", "//platform/core-api:core", + "//platform/editor-ui-ex:editor-ex", + "//platform/editor-ui-api:editor-ui", "//platform/eel-provider", "//platform/execution", "//platform/execution-impl", @@ -42,27 +46,22 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-impl:ide-impl_test_lib", "//platform/projectModel-api:projectModel", + "//platform/testFramework", + "//platform/testFramework:testFramework_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/util", + "//platform/util/coroutines", "//python/openapi:community", "//python/openapi:community_test_lib", "//python/poetry", "//python/setup-test-environment:community-testFramework-testEnv", "//python/python-sdk:sdk", "//python/python-sdk:sdk_test_lib", - "@lib//:python-community-junit5_tests-framework-uk-webcompere-system-stubs-jupiter", - "//platform/util/coroutines", - "@lib//:byte-buddy", - "//platform/testFramework", - "//platform/testFramework:testFramework_test_lib", - "//platform/editor-ui-api:editor-ui", - "//platform/editor-ui-ex:editor-ex", - "//platform/analysis-impl", ], exports = [ + "//libraries/system-stubs-jupiter", "//python/setup-test-environment:community-testFramework-testEnv", - "@lib//:python-community-junit5_tests-framework-uk-webcompere-system-stubs-jupiter", ], runtime_deps = [ ":community-junit5Tests-framework_test_resources", diff --git a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml index a8aac192e26d..f8e496a709aa 100644 --- a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml +++ b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml @@ -20,54 +20,27 @@ + + + + + + - - - - - - 9a24867a51f5d22db67d9052a06bc5dd2e9a3e273bc2ee9814620f2d9f25d0a8 - - - 9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1 - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml index 2b8d4b3b8d54..14b844cd20ac 100644 --- a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml +++ b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml @@ -1,5 +1,6 @@ +