Merge remote-tracking branch 'origin/master' into mq/hpy-update-100322

Author: timfel

CHANGELOG.md

@@ -5,9 +5,10 @@ language runtime. The main focus is on user-observable behavior of the engine.
 
 ## Version 22.1.0
 * String conversion (`__str__`) now calls `toString` for Java objects and `toDisplayString` interop message for foreign objects.
-* Improved compatibility with PyPI packages `lxml`, `pytz`, `Pillow`, `urllib3`, `setuptools`
+* Improved compatibility with PyPI packages `lxml`, `pytz`, `Pillow`, `urllib3`, `setuptools`, `pytest`, `twine`, `jinja2`, and `six`
 * Introduced dependency on bouncycastle
 * Added support for more private key formats (PKCS#1, password protected) in ssl module
+* Added support for module freezing, which makes start to the Python REPL 30% faster and with 40% less memory usage.
 
 ## Version 22.0.0
 * Added support for `pyexpat` module.

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "5ec759140c0a336420842579a87ebc2e4d20b8e7" }
+{ "overlay": "c00ca17e31eab8ca27e6acac0fbe0534f8585490" }

graalpython/com.oracle.graal.python.cext/lzma/config.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -70,7 +70,11 @@
 #define HAVE_FCNTL_H 1
 #define HAVE_FUTIMENS 1
 #define HAVE_GETTEXT 1
+#ifdef __aarch64__
+#define HAVE_IMMINTRIN_H 0
+#else
 #define HAVE_IMMINTRIN_H 1
+#endif
 #define HAVE_INTTYPES_H 1
 #define HAVE_LIMITS_H 1
 #define HAVE_MBRTOWC 1

graalpython/com.oracle.graal.python.parser.antlr/Makefile

@@ -56,7 +56,7 @@ ${STAMP}: ${SOURCE} ${POSTPROCESSOR}
 
 # postprocessing to make source compile without warnings
 ${PARSER_PATH}/%.java: ${STAMP}
-	python ${POSTPROCESSOR} $@
+	python3 ${POSTPROCESSOR} $@
 
 clean:
 ifeq ($(wildcard ${SOURCE}),)

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -89,7 +89,7 @@ public class PythonProvider implements LanguageProvider {
     private static final TypeDescriptor BOOL = BOOLEAN;
     private static final TypeDescriptor FLOAT = NUMBER;
     private static final TypeDescriptor COMPLEX = intersection(OBJECT);
-    private static final TypeDescriptor NONE = NULL;
+    private static final TypeDescriptor NONE = intersection(NULL, OBJECT);
     private static final TypeDescriptor STR = intersection(OBJECT, STRING, ITERABLE, array(STRING));
     private static final TypeDescriptor BYTES = intersection(OBJECT, ITERABLE, array(INT));
     private static final TypeDescriptor BYTEARRAY = intersection(OBJECT, ITERABLE, array(INT));

graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2022, 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
@@ -40,9 +40,8 @@
 import glob
 import os
 import subprocess
-import test
-
 import sys
+import test
 
 if os.environ.get("ENABLE_CPYTHON_TAGGED_UNITTESTS") == "true" or __name__ == "__main__":
     TAGS_DIR = os.path.join(os.path.dirname(__file__), "unittest_tags")
@@ -139,7 +138,18 @@ class TestTaggedUnittests(unittest.TestCase):
         total = 1
     assert selected < total
 
-    working_tests = collect_working_tests()[selected::total]
+    working_tests = collect_working_tests()
+    selection = os.environ.get('TAGGED_UNITTEST_SELECTION')
+    if not selection:
+        working_tests = working_tests[selected::total]
+    else:
+        selection = set(s.strip() for s in selection.split(","))
+        working_tests = [x for x in working_tests if x[0] in selection]
+    print("-----------------------------------------------------------------------------------------------------------")
+    print("working tests: ")
+    print([x[0] for x in working_tests])
+    print("-----------------------------------------------------------------------------------------------------------")
+
     for idx, working_test in enumerate(working_tests):
         fn = make_test_function(working_test)
         fn.__name__ = "%s[%d/%d]" % (fn.__name__, idx + 1, len(working_tests))

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

@@ -0,0 +1 @@
+*graalpython.lib-python.3.test.test_frozen.TestFrozen.test_frozen

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

@@ -10,6 +10,7 @@
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_issue3594
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_issue5604
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_issue9319
+*graalpython.lib-python.3.test.test_imp.ImportTests.test_issue_35321
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_load_dynamic_ImportError_path
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_load_from_source
 *graalpython.lib-python.3.test.test_imp.ImportTests.test_load_module_extension_file_is_None

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

@@ -439,6 +439,24 @@
 *lib2to3.tests.test_fixers.Test_urllib.test_import_module_as
 *lib2to3.tests.test_fixers.Test_urllib.test_import_module_usage
 *lib2to3.tests.test_fixers.Test_urllib.test_indented
+*lib2to3.tests.test_fixers.Test_urllib.test_star
+*lib2to3.tests.test_fixers.Test_xrange.test_in_consuming_context
+*lib2to3.tests.test_fixers.Test_xrange.test_in_contains_test
+*lib2to3.tests.test_fixers.Test_xrange.test_prefix_preservation
+*lib2to3.tests.test_fixers.Test_xrange.test_range_in_for
+*lib2to3.tests.test_fixers.Test_xrange.test_single_arg
+*lib2to3.tests.test_fixers.Test_xrange.test_three_args
+*lib2to3.tests.test_fixers.Test_xrange.test_two_args
+*lib2to3.tests.test_fixers.Test_xrange.test_wrap_in_list
+*lib2to3.tests.test_fixers.Test_xrange.test_xrange_in_for
+*lib2to3.tests.test_fixers.Test_xrange_with_reduce.test_double_transform
+*lib2to3.tests.test_fixers.Test_xreadlines.test_attr_ref
+*lib2to3.tests.test_fixers.Test_xreadlines.test_call
+*lib2to3.tests.test_fixers.Test_xreadlines.test_unchanged
+*lib2to3.tests.test_fixers.Test_zip.test_future_builtins
+*lib2to3.tests.test_fixers.Test_zip.test_zip_basic
+*lib2to3.tests.test_fixers.Test_zip.test_zip_nochange
+*lib2to3.tests.test_fixers.Test_zip.test_zip_trailers
 *lib2to3.tests.test_parser.TestPgen2Caching.test_load_grammar_from_pickle
 *lib2to3.tests.test_parser.TestPgen2Caching.test_load_grammar_from_subprocess
 *lib2to3.tests.test_parser.TestPgen2Caching.test_load_grammar_from_txt_file

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

@@ -93,7 +93,6 @@
 *graalpython.lib-python.3.test.test_logging.HandlerTest.test_name
 *graalpython.lib-python.3.test.test_logging.HandlerTest.test_path_objects
 *graalpython.lib-python.3.test.test_logging.HandlerTest.test_post_fork_child_no_deadlock
-*graalpython.lib-python.3.test.test_logging.HandlerTest.test_race
 *graalpython.lib-python.3.test.test_logging.IPv6SysLogHandlerTest.test_output
 *graalpython.lib-python.3.test.test_logging.LastResortTest.test_last_resort
 *graalpython.lib-python.3.test.test_logging.LogRecordFactoryTest.test_logrecord_class