[GR-21590] Update imports.

PullRequest: graalpython/3175

Author: cosminbasca

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "2833514f9e14c27b3befe758c21886dcb331e1e1" }
+{ "overlay": "af0d52eb5dfe7fd02ca5ec0d61fb6b8979944714" }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/ClinicTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -66,10 +66,6 @@
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.test.PythonTests;
-import com.oracle.graal.python.test.builtin.modules.ClinicTestsClinicProviders.MyBuiltinWithCustomConvertorClinicProviderGen;
-import com.oracle.graal.python.test.builtin.modules.ClinicTestsClinicProviders.MyBuiltinWithDefaultValuesClinicProviderGen;
-import com.oracle.graal.python.test.builtin.modules.ClinicTestsFactory.MyBuiltinWithCustomConvertorNodeGen;
-import com.oracle.graal.python.test.builtin.modules.ClinicTestsFactory.MyBuiltinWithDefaultValuesNodeGen;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -101,7 +97,7 @@ public void tearDown() {
     public abstract static class MyBuiltinWithDefaultValues extends PythonBinaryClinicBuiltinNode {
         @Override
         protected ArgumentClinicProvider getArgumentClinic() {
-            return MyBuiltinWithDefaultValuesClinicProviderGen.INSTANCE;
+            return ClinicTestsClinicProviders.MyBuiltinWithDefaultValuesClinicProviderGen.INSTANCE;
         }
 
         @Specialization
@@ -114,7 +110,7 @@ Object doDefaults(int a, int b) {
 
     @Test
     public void testDefaultValues() {
-        CallTarget callTarget = createCallTarget(MyBuiltinWithDefaultValuesNodeGen.create());
+        CallTarget callTarget = createCallTarget(ClinicTestsFactory.MyBuiltinWithDefaultValuesNodeGen.create());
         assertEquals(T_DO_DEFAULTS, callTarget.call(PNone.NO_VALUE, PNone.NO_VALUE));
         assertEquals(T_DO_DEFAULTS, callTarget.call(PNone.NONE, PNone.NO_VALUE));
         assertEquals(T_TYPE_ERROR, callTarget.call(PNone.NONE, PNone.NONE, EXPECT_TYPE_ERROR));
@@ -167,7 +163,7 @@ public abstract static class MyBuiltinWithCustomConvertor extends PythonBinaryCl
 
         @Override
         protected ArgumentClinicProvider getArgumentClinic() {
-            return MyBuiltinWithCustomConvertorClinicProviderGen.INSTANCE;
+            return ClinicTestsClinicProviders.MyBuiltinWithCustomConvertorClinicProviderGen.INSTANCE;
         }
 
         @Specialization
@@ -180,7 +176,7 @@ Object doDefaults(int a, int b) {
 
     @Test
     public void testCustomConvertor() {
-        CallTarget callTarget = createCallTarget(MyBuiltinWithCustomConvertorNodeGen.create());
+        CallTarget callTarget = createCallTarget(ClinicTestsFactory.MyBuiltinWithCustomConvertorNodeGen.create());
         assertEquals(T_DONE, callTarget.call(T_A_INPUT, T_B_INPUT));
     }
 

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "de0660c98f6e5f96b0bf5ccf3d585785a2cb3d87",
+                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "de0660c98f6e5f96b0bf5ccf3d585785a2cb3d87",
+                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "de0660c98f6e5f96b0bf5ccf3d585785a2cb3d87",
+                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "de0660c98f6e5f96b0bf5ccf3d585785a2cb3d87",
+                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},