Merge branch 'master' into topic/GR-15977-os.exec-with-os.environ

# Conflicts:
#	graalpython/com.oracle.graal.python.cext/include/Python.h
#	graalpython/com.oracle.graal.python.test/src/tests/test_posix.py
#	graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

Author: Franziska Geiger

CHANGELOG.md

@@ -3,6 +3,13 @@
 This changelog summarizes major changes between GraalVM versions of the Python
 language runtime. The main focus is on user-observable behavior of the engine.
 
+## Version 19.0.0
+
+* Fix an issue preventing use of encodings in the installable binary
+* Fix return value of process when `os.exit` is called with a boolean
+* Fix interpretation of foreign objects to prefer interpreting them as integer over double
+* Fix performance regression when repeatedly creating a new function in a loop
+
 ## Version 1.0.0 RC16
 
 * No user-facing changes

LICENSE

@@ -1,7 +1,7 @@
-Product License  - GraalVM Community Edition 1.0 Python Language 
+Product License  - GraalVM Community Edition 20.0 Python Language 
 Component
 
-This is a release of GraalVM Community Edition 1.0 Python Language Component. 
+This is a release of GraalVM Community Edition 20.0 Python Language Component. 
 This particular copy of the software is released under Universal Permissive 
 License (UPL) v. 1.0.
 Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved

ci.jsonnet

@@ -128,7 +128,7 @@
 
   local labsjdk8Mixin = {
     downloads +: {
-      JAVA_HOME: utils.download("labsjdk", "8u202-jvmci-0.59"),
+      JAVA_HOME: utils.download("oraclejdk", "8u212-jvmci-20-b01"),
       EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "11+28")] },
     },
     environment +: {

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -121,8 +121,6 @@
 #include "iterobject.h"
 #include "datetime.h"
 #include "typeslots.h"
-#include "weakrefobject.h"
-#include "sysmodule.h"
 
 // TODO: we must extend the refcounting behavior to support handles to managed objects
 #undef Py_DECREF

graalpython/com.oracle.graal.python.cext/include/sysmodule.h

@@ -68,15 +68,15 @@ def test_execl(self):
         # test creates a shell script, which again creates a file, to ensure script execution
         # Both files are deleted again in the end
         new_file_path, cwd = self.create_file()
-        os.system("%s -c \"import os; os.execl('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
+        os.system("%s -c \"import os; os.execl('%s', *['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         self.delete_file(new_file_path, cwd)
 
     def test_execv_with_env(self):
         new_file_path, cwd = self.create_file()
         with open(new_file_path, 'w') as script:
                 script.write('echo $ENV_VAR> {}/test.txt\n'.format(cwd))
-        os.system("%s -c \"import os; os.environ['ENV_VAR']='the_text'; os.execl('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
+        os.system("%s -c \"import os; os.environ['ENV_VAR']='the_text'; os.execv('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         with open(cwd+'/test.txt', 'r') as result:
             assert 'the_text' in result.readline()

graalpython/com.oracle.graal.python.cext/include/weakrefobject.h

@@ -97,7 +97,6 @@ graalpython/com.oracle.graal.python.cext/include/setobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/sliceobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/structmember.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/structseq.h,python.copyright
-graalpython/com.oracle.graal.python.cext/include/sysmodule.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/traceback.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/truffle.h,no.copyright
 graalpython/com.oracle.graal.python.cext/include/tupleobject.h,python.copyright

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

@@ -907,13 +907,28 @@ def import_python_sources(args):
 # register as a GraalVM language
 #
 # ----------------------------------------------------------------------------------------------------------------------
+mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
+    suite=SUITE,
+    name='Graal.Python license files',
+    short_name='pynl',
+    dir_name='python',
+    license_files=['LICENSE_GRAALPYTHON.txt'],
+    third_party_license_files=['3rd_party_licenses_graalpython.txt'],
+    truffle_jars=[],
+    support_distributions=[
+        'graalpython:GRAALPYTHON_GRAALVM_LICENSES',
+    ],
+    priority=5
+))
+
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=SUITE,
     name='Graal.Python',
     short_name='pyn',
     dir_name='python',
-    license_files=['LICENSE_GRAALPYTHON'],
-    third_party_license_files=['3rd_party_licenses_graalpython.txt'],
+    license_files=[],
+    third_party_license_files=[],
     truffle_jars=[
         'graalpython:GRAALPYTHON',
     ],
@@ -926,10 +941,8 @@ def import_python_sources(args):
             destination='bin/<exe:graalpython>',
             jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
             main_class='com.oracle.graal.python.shell.GraalPythonMain',
-            build_args=[
-                '--language:python',
-                '--language:llvm',
-            ]
+            build_args=[],
+            language='python',
         )
     ],
 ))

mx.graalpython/copyrights/overrides

@@ -1,12 +1,7 @@
 # This file contains native-image arguments needed to build graalpython
 #
 
-ImageName = graalpython
-
-Requires = tool:regex language:llvm
-
-LauncherClass = com.oracle.graal.python.shell.GraalPythonMain
-LauncherClassPath = lib/graalvm/launcher-common.jar:lib/graalvm/graalpython-launcher.jar
+Requires = language:regex language:llvm
 
 JavaArgs = -Xmx4G -Dpolyglot.engine.PreinitializeContexts=python