patch venv: add support for installing pip during venv creation

Author: cosminbasca

graalpython/lib-python/3/venv/__init__.py

@@ -46,11 +46,6 @@ def __init__(self, system_site_packages=False, clear=False,
         self.symlinks = symlinks
         self.upgrade = upgrade
         self.with_pip = with_pip
-        # Truffle change
-        if with_pip:
-            logger.warning("We cannot install pip on Graal Python, yet")
-        self.with_pip = False
-        # End Truffle change
         self.prompt = prompt
 
     def create(self, env_dir):
@@ -119,9 +114,22 @@ def create_if_needed(d):
         context.python_dir = dirname
         context.python_exe = exename
 
+        if sys.platform == 'win32':
+            binname = 'Scripts'
+            incpath = 'Include'
+            libpath = os.path.join(env_dir, 'Lib', 'site-packages')
+        else:
+            binname = 'bin'
+            incpath = 'include'
+            libpath = os.path.join(env_dir, 'lib',
+                                   'python%d.%d' % sys.version_info[:2],
+                                   'site-packages')
+
         # Truffle change: our executable may not just be a file (e.g. we're
         # running through java), we always provide a script for launching in
         # venv
+        exename = context.python_exe = "graalpython"
+
         import atexit, tempfile
         tempdir = tempfile.mkdtemp()
         script = os.path.join(tempdir, "graalpython")
@@ -132,6 +140,13 @@ def create_if_needed(d):
             if sys.platform != "win32":
                 f.write("#!/bin/sh\n")
             f.write(sys.executable)
+            f.write(" --python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (
+                sys.graal_python_core_home,
+                sys.graal_python_stdlib_home,
+                context.env_dir,
+                sys.base_prefix,
+                os.path.join(context.env_dir, binname, exename),
+            ))
             if sys.platform == "win32":
                 f.write(" %*")
             else:
@@ -143,24 +158,13 @@ def create_if_needed(d):
         atexit.register(lambda: shutil.rmtree(tempdir, ignore_errors=True))
 
         dirname = context.python_dir = sys.graal_python_home
-        exename = context.python_exe = "graalpython"
         context.executable = script
 
         if self.symlinks:
             logger.warning("We're not using symlinks in a Graal Python venv")
         self.symlinks = False
         # End of Truffle change
 
-        if sys.platform == 'win32':
-            binname = 'Scripts'
-            incpath = 'Include'
-            libpath = os.path.join(env_dir, 'Lib', 'site-packages')
-        else:
-            binname = 'bin'
-            incpath = 'include'
-            libpath = os.path.join(env_dir, 'lib',
-                                   'python%d.%d' % sys.version_info[:2],
-                                   'site-packages')
         context.inc_path = path = os.path.join(env_dir, incpath)
         create_if_needed(path)
         create_if_needed(libpath)
@@ -278,7 +282,10 @@ def _setup_pip(self, context):
         # We run ensurepip in isolated mode to avoid side effects from
         # environment vars, the current directory and anything else
         # intended for the global Python environment
-        cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade',
+        # Truffle change: the graal python interpreter cannot yet parse grouped flags
+        # cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade',
+        # End Truffle change
+        cmd = [context.env_exe, '-I', '-m', 'ensurepip', '--upgrade',
                                                     '--default-pip']
         subprocess.check_output(cmd, stderr=subprocess.STDOUT)
 
@@ -323,7 +330,7 @@ def replace_variables(self, text, context):
         text = text.replace('__VENV_PROMPT__', context.prompt)
         text = text.replace('__VENV_BIN_NAME__', context.bin_name)
         text = text.replace('__VENV_PYTHON__', context.env_exe)
-        # Truffle change: we need to set some extra options for the launcher to work
+        # Truffle change: # Truffle change: we need to set some extra options for the launcher to work
         text = text.replace(
             '__VENV_GRAAL_PYTHON_OPTIONS__',
             "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (