[GR-21590] Update imports

PullRequest: graalpython/2150

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "955765a94e2eaed92fef6480886516843fb127f6" }
+{ "overlay": "6176531f89b51af931ba73cc53df24b7457bc46f" }

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ftplib.txt

@@ -38,7 +38,9 @@
 *graalpython.lib-python.3.test.test_ftplib.TestIPv6Environment.test_makepasv
 *graalpython.lib-python.3.test.test_ftplib.TestIPv6Environment.test_makeport
 *graalpython.lib-python.3.test.test_ftplib.TestIPv6Environment.test_transfer
+*graalpython.lib-python.3.test.test_ftplib.TestMain.test_main
 *graalpython.lib-python.3.test.test_ftplib.TestTLS_FTPClass.test_auth_issued_twice
+*graalpython.lib-python.3.test.test_ftplib.TestTLS_FTPClass.test_ccc
 *graalpython.lib-python.3.test.test_ftplib.TestTLS_FTPClass.test_check_hostname
 *graalpython.lib-python.3.test.test_ftplib.TestTLS_FTPClass.test_context
 *graalpython.lib-python.3.test.test_ftplib.TestTLS_FTPClass.test_control_connection

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_re.txt

@@ -120,3 +120,4 @@
 *graalpython.lib-python.3.test.test_re.ReTests.test_symbolic_refs
 *graalpython.lib-python.3.test.test_re.ReTests.test_unlimited_zero_width_repeat
 *graalpython.lib-python.3.test.test_re.ReTests.test_weakref
+*graalpython.lib-python.3.test.test_re.ReTests.test_zerowidth

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

@@ -121,7 +121,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleFile;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Cached;
@@ -768,7 +767,8 @@ private void validate(HashingStorage dictStorage) {
     @GenerateNodeFactory
     public abstract static class JavaExtendNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object doIt(Object value) {
+        Object doIt(Object value,
+                        @CachedLibrary(limit = "3") InteropLibrary lib) {
             if (ImageInfo.inImageBuildtimeCode()) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new UnsupportedOperationException(ErrorMessages.CANT_EXTEND_JAVA_CLASS_NOT_JVM);
@@ -779,21 +779,19 @@ Object doIt(Object value) {
             }
 
             Env env = getContext().getEnv();
-            if (!isType(value, env)) {
+            if (!isType(value, env, lib)) {
                 throw raise(TypeError, ErrorMessages.CANT_EXTEND_JAVA_CLASS_NOT_TYPE, value);
             }
 
-            final Class<?>[] types = new Class<?>[1];
-            types[0] = (Class<?>) env.asHostObject(value);
             try {
-                return env.createHostAdapterClass(types);
+                return env.createHostAdapter(new Object[]{value});
             } catch (Exception ex) {
                 throw raise(TypeError, ex.getMessage(), ex);
             }
         }
 
-        protected static boolean isType(Object obj, TruffleLanguage.Env env) {
-            return env.isHostObject(obj) && env.asHostObject(obj) instanceof Class<?>;
+        protected static boolean isType(Object obj, Env env, InteropLibrary lib) {
+            return env.isHostObject(obj) && (env.isHostSymbol(obj) || lib.isMetaObject(obj));
         }
 
     }

graalpython/lib-graalpython/patches/pytest/whl/pytest-7.patch

@@ -0,0 +1,57 @@
+From 38f7d1bd9869f7eeff41530e8e451caa026ef327 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <michael.simacek@oracle.com>
+Date: Mon, 14 Feb 2022 11:24:57 +0100
+Subject: [PATCH] Adapt for GraalPython
+
+---
+ _pytest/_code/code.py         | 20 +++++++++++---------
+ _pytest/assertion/__init__.py |  2 +-
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
+index 5b758a8..869ad4e 100644
+--- a/_pytest/_code/code.py
++++ b/_pytest/_code/code.py
+@@ -256,15 +256,17 @@ class TracebackEntry:
+             if key is not None:
+                 astnode = astcache.get(key, None)
+         start = self.getfirstlinesource()
+-        try:
+-            astnode, _, end = getstatementrange_ast(
+-                self.lineno, source, astnode=astnode
+-            )
+-        except SyntaxError:
+-            end = self.lineno + 1
+-        else:
+-            if key is not None and astcache is not None:
+-                astcache[key] = astnode
++        # GraalPython: no support for the ast module so the source cannot be retrieved correctly
++        # try:
++        #     astnode, _, end = getstatementrange_ast(
++        #         self.lineno, source, astnode=astnode
++        #     )
++        # except SyntaxError:
++        #     end = self.lineno + 1
++        # else:
++        #     if key is not None and astcache is not None:
++        #         astcache[key] = astnode
++        end = -1
+         return source[start:end]
+ 
+     source = property(getsource)
+diff --git a/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py
+index 480a26a..2466ea8 100644
+--- a/_pytest/assertion/__init__.py
++++ b/_pytest/assertion/__init__.py
+@@ -26,7 +26,7 @@ def pytest_addoption(parser: Parser) -> None:
+         action="store",
+         dest="assertmode",
+         choices=("rewrite", "plain"),
+-        default="rewrite",
++        default="plain",
+         metavar="MODE",
+         help=(
+             "Control assertion debugging tools.\n"
+-- 
+2.34.1
+

mx.graalpython/mx_graalpython.py

@@ -302,6 +302,7 @@ def retag_unittests(args):
     parser.add_argument('--upload-results-to')
     parser.add_argument('--inspect', action='store_true')
     parser.add_argument('-debug-java', action='store_true')
+    parser.add_argument('--jvm', action='store_true')
     parsed_args, remaining_args = parser.parse_known_args(args)
     env = os.environ.copy()
     env.update(
@@ -320,7 +321,8 @@ def retag_unittests(args):
         'graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py',
         '--retag'
     ]
-    mx.run([python_svm()] + args + remaining_args, env=env)
+    vm = python_svm() if not parsed_args.jvm else python_gvm_with_assertions()
+    mx.run([vm] + args + remaining_args, env=env)
     if parsed_args.upload_results_to:
         with tempfile.TemporaryDirectory(prefix='graalpython-retagger-') as d:
             filename = os.path.join(d, 'unittest-tags-{}.tar.bz2'.format(sys.platform))
@@ -1158,7 +1160,7 @@ def update_import_cmd(args):
             exec(f.read(), d, d) # pylint: disable=exec-used;
         for suite in d["suite"].get("imports", {}).get("suites", []):
             import_name = suite["name"]
-            if suite.get("version") and import_name not in local_names:
+            if suite.get("version") and import_name not in local_names and import_name != 'library-tester':
                 imports_to_update.add(import_name)
 
     revisions = {}

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "aebf9889d1856b765b9498089e09ad255765cb4e",
+                "version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "aebf9889d1856b765b9498089e09ad255765cb4e",
+                "version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "aebf9889d1856b765b9498089e09ad255765cb4e",
+                "version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},