[GR-6672] [GR-9653] [GR-9642] Bump imports to work with 1.0 release changes once merged to master

PullRequest: graalpython-open/26

Author: timfel

ci.jsonnet

@@ -201,8 +201,7 @@
     baseGraalGate + {tags:: "python-"+type} + getPlatform(platform) + {name: "python-"+ type +"-"+platform},
 
   local styleGate = baseGraalGate + eclipseMixin + linuxMixin + {
-    // temporarily disabled - tags:: "style,fullbuild,python-license",
-    tags:: "python-license",
+    tags:: "style,fullbuild,python-license",
     name: "python-style",
 
     timelimit: TIME_LIMIT["1h"],

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -157,7 +157,6 @@ public void initialize(PythonCore core) {
         builtinConstants.put(BuiltinNames.__DEBUG__, !optimazeFlag);
     }
 
-    
     // abs(x)
     @Builtin(name = ABS, fixedNumOfArguments = 1)
     @GenerateNodeFactory

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -232,7 +232,7 @@ protected Object doGeneric(Object self, Object idx) {
             if (!isValidIndexType(idx)) {
                 throw raise(TypeError, "list indices must be integers or slices, not %p", idx);
             }
-            throw  raise(TypeError, "descriptor '__delitem__' requires a 'list' object but received a '%p'", idx);
+            throw raise(TypeError, "descriptor '__delitem__' requires a 'list' object but received a '%p'", idx);
         }
 
         protected boolean isValidIndexType(Object idx) {
@@ -318,7 +318,7 @@ protected Object doGeneric(Object self, Object idx) {
             if (!isValidIndexType(idx)) {
                 throw raise(TypeError, "list indices must be integers or slices, not %p", idx);
             }
-            throw  raise(TypeError, "descriptor '__getitem__' requires a 'list' object but received a '%p'", idx);
+            throw raise(TypeError, "descriptor '__getitem__' requires a 'list' object but received a '%p'", idx);
         }
 
         protected boolean isValidIndexType(Object idx) {
@@ -400,7 +400,7 @@ protected Object doGeneric(Object self, Object idx, Object value) {
             if (!isValidIndexType(idx)) {
                 throw raise(TypeError, "list indices must be integers or slices, not %p", idx);
             }
-            throw  raise(TypeError, "descriptor '__setitem__' requires a 'list' object but received a '%p'", idx);
+            throw raise(TypeError, "descriptor '__setitem__' requires a 'list' object but received a '%p'", idx);
         }
 
         protected boolean isValidIndexType(Object idx) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectIsSubclassNode.java

@@ -44,7 +44,6 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
 @NodeInfo(shortName = "cpython://Objects/abstract.c/abstract_issubclass")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java

@@ -43,8 +43,8 @@ public class AssertNode extends StatementNode {
     @Child private CastToBooleanNode condition;
     @Child private PNode message;
     @Child private LookupAndCallUnaryNode callNode;
-    @CompilerDirectives.CompilationFinal private Boolean assertionsEnabled = null; 
-    
+    @CompilerDirectives.CompilationFinal private Boolean assertionsEnabled = null;
+
     public AssertNode(CastToBooleanNode condition, PNode message) {
         this.condition = condition;
         this.message = message;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -96,9 +96,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "") //
     public static final OptionKey<Boolean> PythonInspectFlag = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.USER, help = "Remove assert statements and any code conditional on the value of __debug__.")
-    public static final OptionKey<Boolean> PythonOptimizeFlag = new OptionKey<>(false);
-    
+    @Option(category = OptionCategory.USER, help = "Remove assert statements and any code conditional on the value of __debug__.") public static final OptionKey<Boolean> PythonOptimizeFlag = new OptionKey<>(
+                    false);
+
     public static OptionDescriptors createDescriptors() {
         return new PythonOptionsOptionDescriptors();
     }

mx.graalpython/mx_graalpython.py

@@ -293,6 +293,8 @@ def python_gate(args):
         find_jdt()
     if not os.environ.get("ECLIPSE_EXE"):
         find_eclipse()
+    if "--tags" not in args:
+        args += ["--tags", "fullbuild,style,python-junit,python-unittest,python-license,python-downstream"]
     return mx.command_function("gate")(args)
 
 
@@ -361,9 +363,9 @@ def graalpython_gate_runner(args, tasks):
     with Task('GraalPython GraalVM build', tasks, tags=[GraalPythonTags.downstream, GraalPythonTags.graalvm]) as task:
         if task:
             mx.run_mx(
-                ["--strict-compliance", "--dynamicimports", "/substratevm,/vm",
+                ["--dynamicimports", "/substratevm,/vm",
                  "build", "--force-deprecation-as-warning", "--dependencies",
-                 "graalpython.image"],
+                 "GRAAL_MANAGEMENT,graalpython.image"],
                 nonZeroIsFatal=True
             )
             vmdir = os.path.join(mx.suite("truffle").dir, "..", "vm")
@@ -540,32 +542,31 @@ def python_checkcopyrights(args):
 #
 # ----------------------------------------------------------------------------------------------------------------------
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
+    suite=_suite,
     name='Graal.Python',
     short_name='pyn',
     dir_name='python',
-    documentation_files=['link:<support>/README_GRAALPYTHON.md'],
-    license_files=['link:<support>/GraalCE_Python_license_3rd_party_license.txt'],
+    license_files=['link:GraalCE_Python_license_3rd_party_license.txt'],
     third_party_license_files=[],
     truffle_jars=[
-        'dependency:graalpython:GRAALPYTHON',
-        'dependency:graalpython:GRAALPYTHON-ENV',
+        'graalpython:GRAALPYTHON',
     ],
     support_distributions=[
-        'extracted-dependency:graalpython:GRAALPYTHON_GRAALVM_SUPPORT',
-        'extracted-dependency:graalpython:GRAALPYTHON_GRAALVM_DOCS',
+        'graalpython:GRAALPYTHON_GRAALVM_SUPPORT',
+        'graalpython:GRAALPYTHON_GRAALVM_DOCS',
     ],
     launcher_configs=[
         mx_sdk.LanguageLauncherConfig(
             destination='bin/<exe:graalpython>',
-            jar_distributions=['dependency:graalpython:GRAALPYTHON-LAUNCHER'],
+            jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
             main_class='com.oracle.graal.python.shell.GraalPythonMain',
             build_args=[
                 '--language:python',
                 '--language:llvm',
             ]
         )
     ],
-), _suite)
+))
 
 
 # ----------------------------------------------------------------------------------------------------------------------

mx.graalpython/suite.py

@@ -32,7 +32,7 @@
             },
             {
                 "name": "regex",
-                "version": "5a45980a4cb8b32a3d964a99d6e356717fcdb678",
+                "version": "3535ccebc4c19ebe9be7da93aaab1bca37afea5a",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -208,6 +208,9 @@
         "GRAALPYTHON-ENV": {
         },
 
+        "GRAALPYTHON-ZIP": {
+        },
+
         "GRAALPYTHON": {
             "dependencies": [
                 "com.oracle.graal.python",