[GR-13824] Fix installation of NumPy in a venv

timfel · timfel · commit 9104425805f1 · 2019-02-10T22:00:33.000-08:00
PullRequest: graalpython/403
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -78,7 +78,8 @@ public static void main(String[] args) {
     @Override
     protected List<String> preprocessArguments(List<String> givenArgs, Map<String, String> polyglotOptions) {
         ArrayList<String> unrecognized = new ArrayList<>();
-        ArrayList<String> inputArgs = new ArrayList<>(getDefaultEnvironmentArgs());
+        List<String> defaultEnvironmentArgs = getDefaultEnvironmentArgs();
+        ArrayList<String> inputArgs = new ArrayList<>(defaultEnvironmentArgs);
         inputArgs.addAll(givenArgs);
         givenArguments = new ArrayList<>(inputArgs);
         List<String> arguments = new ArrayList<>(inputArgs);
@@ -142,15 +143,15 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     versionAction = VersionAction.PrintAndContinue;
                     break;
                 case "-CC":
-                    if (i != 0) {
-                        throw new IllegalArgumentException("-CC must be the first argument");
+                    if (i != defaultEnvironmentArgs.size()) {
+                        throw new IllegalArgumentException("-CC must be the first given argument");
                     }
                     GraalPythonCC.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));
                     System.exit(0);
                     break;
                 case "-LD":
-                    if (i != 0) {
-                        throw new IllegalArgumentException("-LD must be the first argument");
+                    if (i != defaultEnvironmentArgs.size()) {
+                        throw new IllegalArgumentException("-LD must be the first given argument");
                     }
                     GraalPythonLD.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));
                     System.exit(0);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -146,14 +146,16 @@ protected PythonContext createContext(Env env) {
     private void ensureHomeInOptions(Env env) {
         String languageHome = getLanguageHome();
         String sysPrefix = env.getOptions().get(PythonOptions.SysPrefix);
+        String basePrefix = env.getOptions().get(PythonOptions.SysBasePrefix);
         String coreHome = env.getOptions().get(PythonOptions.CoreHome);
         String stdLibHome = env.getOptions().get(PythonOptions.StdLibHome);
 
         PythonCore.writeInfo((MessageFormat.format("Initial locations:" +
                         "\n\tLanguage home: {0}" +
                         "\n\tSysPrefix: {1}" +
-                        "\n\tCoreHome: {2}" +
-                        "\n\tStdLibHome: {3}", languageHome, sysPrefix, coreHome, stdLibHome)));
+                        "\n\tBaseSysPrefix: {2}" +
+                        "\n\tCoreHome: {3}" +
+                        "\n\tStdLibHome: {4}", languageHome, sysPrefix, basePrefix, coreHome, stdLibHome)));
 
         TruffleFile home = null;
         if (languageHome != null) {
@@ -173,7 +175,13 @@ private void ensureHomeInOptions(Env env) {
 
         if (home != null) {
             if (sysPrefix.isEmpty()) {
-                env.getOptions().set(PythonOptions.SysPrefix, home.getAbsoluteFile().getPath());
+                sysPrefix = home.getAbsoluteFile().getPath();
+                env.getOptions().set(PythonOptions.SysPrefix, sysPrefix);
+            }
+
+            if (basePrefix.isEmpty()) {
+                basePrefix = home.getAbsoluteFile().getPath();
+                env.getOptions().set(PythonOptions.SysBasePrefix, basePrefix);
             }
 
             if (coreHome.isEmpty()) {
@@ -209,8 +217,9 @@ private void ensureHomeInOptions(Env env) {
             PythonCore.writeInfo((MessageFormat.format("Updated locations:" +
                             "\n\tLanguage home: {0}" +
                             "\n\tSysPrefix: {1}" +
-                            "\n\tCoreHome: {2}" +
-                            "\n\tStdLibHome: {3}", home.getPath(), sysPrefix, coreHome, stdLibHome)));
+                            "\n\tSysBasePrefix: {2}" +
+                            "\n\tCoreHome: {3}" +
+                            "\n\tStdLibHome: {4}", home.getPath(), sysPrefix, basePrefix, coreHome, stdLibHome)));
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -104,7 +104,8 @@ public class SysModuleBuiltins extends PythonBuiltins {
         COMPILE_TIME = compile_time;
     }
 
-    public static final String[] SYS_PREFIX_ATTRIBUTES = new String[]{"prefix", "exec_prefix", "base_prefix", "base_exec_prefix"};
+    public static final String[] SYS_PREFIX_ATTRIBUTES = new String[]{"prefix", "exec_prefix"};
+    public static final String[] BASE_PREFIX_ATTRIBUTES = new String[]{"base_prefix", "base_exec_prefix"};
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
@@ -159,11 +160,17 @@ public void postInitialize(PythonCore core) {
         PythonContext context = core.getContext();
         String[] args = context.getEnv().getApplicationArguments();
         sys.setAttribute("argv", core.factory().createList(Arrays.copyOf(args, args.length, Object[].class)));
+
         String prefix = PythonCore.getSysPrefix(context.getEnv());
         for (String name : SysModuleBuiltins.SYS_PREFIX_ATTRIBUTES) {
             sys.setAttribute(name, prefix);
         }
 
+        String base_prefix = PythonCore.getSysBasePrefix(context.getEnv());
+        for (String name : SysModuleBuiltins.BASE_PREFIX_ATTRIBUTES) {
+            sys.setAttribute(name, base_prefix);
+        }
+
         sys.setAttribute("executable", PythonOptions.getOption(context, PythonOptions.Executable));
         sys.setAttribute("graal_python_home", context.getLanguage().getHome());
         sys.setAttribute("graal_python_core_home", PythonOptions.getOption(context, PythonOptions.CoreHome));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java
@@ -120,7 +120,21 @@ public static String getSysPrefix(TruffleLanguage.Env env) {
         if (sysPrefix.isEmpty()) {
             writeWarning(NO_PREFIX_WARNING);
             env.getOptions().set(PythonOptions.SysPrefix, PREFIX);
-            return LIB_GRAALPYTHON;
+            return PREFIX;
+        }
+        return sysPrefix;
+    }
+
+    @TruffleBoundary
+    public static String getSysBasePrefix(TruffleLanguage.Env env) {
+        String sysPrefix = env.getOptions().get(PythonOptions.SysBasePrefix);
+        if (sysPrefix.isEmpty()) {
+            String homePrefix = PythonLanguage.getCurrent().getHome();
+            if (homePrefix.isEmpty()) {
+                homePrefix = PREFIX;
+            }
+            env.getOptions().set(PythonOptions.SysBasePrefix, homePrefix);
+            return homePrefix;
         }
         return sysPrefix;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java
@@ -44,6 +44,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "Set the location of sys.prefix. Overrides any environment variables or Java options.") //
     public static final OptionKey<String> SysPrefix = new OptionKey<>("");
 
+    @Option(category = OptionCategory.EXPERT, help = "Set the location of sys.base_prefix. Overrides any environment variables or Java options.") //
+    public static final OptionKey<String> SysBasePrefix = new OptionKey<>("");
+
     @Option(category = OptionCategory.USER, help = "Set the location of lib-graalpython. Overrides any environment variables or Java options.") //
     public static final OptionKey<String> CoreHome = new OptionKey<>("");
 
diff --git a/graalpython/lib-python/3/venv/__init__.py b/graalpython/lib-python/3/venv/__init__.py
@@ -326,9 +326,11 @@ def replace_variables(self, text, context):
         # 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.Executable='%s'" % (
+            "--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,
                 context.env_exe,
             )
         )

Original file line number	Diff line number	Diff line change
`@@ -326,9 +326,11 @@ def replace_variables(self, text, context):`
`326`	`326`	`# Truffle change: we need to set some extra options for the launcher to work`
`327`	`327`	`text = text.replace(`
`328`	`328`	`'__VENV_GRAAL_PYTHON_OPTIONS__',`
`329`		`- "--python.CoreHome='%s' --python.StdLibHome='%s' --python.Executable='%s'" % (`
	`329`	`+ "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (`
`330`	`330`	`sys.graal_python_core_home,`
`331`	`331`	`sys.graal_python_stdlib_home,`
	`332`	`+ context.env_dir,`
	`333`	`+ sys.base_prefix,`
`332`	`334`	`context.env_exe,`
`333`	`335`	`)`
`334`	`336`	`)`