[GR-13072] Initial support for running the scipy installation procedure

PullRequest: graalpython/350

Author: timfel

graalpython/com.oracle.graal.python.cext/src/signals.c

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+/*
+ * (tfel): This file provides some of the required signalmodule C API.
+ */
+
+int PyErr_CheckSignals() {
+    // Our signal handlers run asynchrounsly on a JVM thread and any Python code
+    // that is triggered should propagate it's exceptions
+    // directly. PyErr_CheckSignals() in CPython only runs pending signal
+    // handlers and returns. A return value of -1 indicates an exception, but we
+    // assume that any exception would be raised in a different code path.
+    return 0;
+}

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

@@ -424,8 +424,18 @@ Object stat(String path, boolean followSymlinks) {
             } else if (f.isSymbolicLink()) {
                 mode |= S_IFLNK;
             } else {
-                // TODO: differentiate these
-                mode |= S_IFSOCK | S_IFBLK | S_IFCHR | S_IFIFO;
+                // TODO: remove the additional check for symlink once GR-13265 is fixed
+                TruffleFile canonicalFile = null;
+                try {
+                    canonicalFile = f.getCanonicalFile();
+                } catch (IOException e) {
+                }
+                if (!f.getAbsoluteFile().equals(canonicalFile)) {
+                    mode |= S_IFLNK;
+                } else {
+                    // TODO: differentiate these
+                    mode |= S_IFSOCK | S_IFBLK | S_IFCHR | S_IFIFO;
+                }
             }
             try {
                 mtime = fileTimeToSeconds(f.getLastModifiedTime(linkOptions));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -385,21 +385,31 @@ abstract static class ContainsNode extends PythonBinaryBuiltinNode {
         @Child private SequenceStorageNodes.LenNode lenNode;
 
         @Specialization
-        @TruffleBoundary
         boolean contains(PBytes self, PBytes other,
                         @Cached("create()") BytesNodes.FindNode findNode) {
             return findNode.execute(self, other, 0, getLength(self.getSequenceStorage())) != -1;
         }
 
         @Specialization
-        @TruffleBoundary
         boolean contains(PBytes self, PByteArray other,
                         @Cached("create()") BytesNodes.FindNode findNode) {
             return findNode.execute(self, other, 0, getLength(self.getSequenceStorage())) != -1;
         }
 
-        @Specialization(guards = "!isBytes(other)")
-        boolean contains(@SuppressWarnings("unused") PBytes self, Object other) {
+        @Specialization
+        boolean contains(PBytes self, int other,
+                        @Cached("create()") BytesNodes.FindNode findNode) {
+            return findNode.execute(self, other, 0, getLength(self.getSequenceStorage())) != -1;
+        }
+
+        @Specialization
+        boolean contains(PBytes self, long other,
+                        @Cached("create()") BytesNodes.FindNode findNode) {
+            return findNode.execute(self, other, 0, getLength(self.getSequenceStorage())) != -1;
+        }
+
+        @Fallback
+        boolean contains(@SuppressWarnings("unused") Object self, Object other) {
             throw raise(TypeError, "a bytes-like object is required, not '%p'", other);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -956,7 +956,7 @@ public PList doSplit(String self, String sep, int maxsplit) {
 
         @Specialization
         public PList doSplit(String self, @SuppressWarnings("unused") PNone sep, int maxsplit) {
-            return splitfields(self, maxsplit + 1);
+            return splitfields(self, maxsplit);
         }
 
         @Fallback

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -79,8 +79,10 @@ public int length() {
 
     @Override
     public void setNewLength(int length) {
-        CompilerDirectives.transferToInterpreter();
-        throw PythonLanguage.getContextRef().get().getCore().raise(ValueError, "list length out of range");
+        if (length != 0) {
+            CompilerDirectives.transferToInterpreter();
+            throw PythonLanguage.getContextRef().get().getCore().raise(ValueError, "list length out of range");
+        }
     }
 
     @Override

graalpython/lib-graalpython/modules/ginstall.py

@@ -54,8 +54,17 @@ def system(cmd, msg=""):
 
 
 def known_packages():
+    def PyYAML():
+        install_from_pypi("PyYAML==3.13")
+
+    def six():
+        install_from_pypi("six==1.12.0")
+
+    def Cython():
+        install_from_pypi("Cython==0.29.2", ['--no-cython-compile'])
+
     def setuptools():
-        install_from_pypi("setuptools")
+        install_from_pypi("setuptools==40.6.3")
 
     def numpy():
         try:
@@ -318,7 +327,7 @@ def xit(msg, status=-1):
     exit(-1)
 
 
-def install_from_pypi(package):
+def install_from_pypi(package, extra_opts=[]):
     if "==" in package:
         package, _, version = package.rpartition("==")
         url = "https://pypi.org/pypi/%s/%s/json" % (package, version)
@@ -353,7 +362,7 @@ def install_from_pypi(package):
         else:
             xit("Unknown file type: %s" % filename)
 
-        status = os.system("cd %s/%s; %s setup.py install --user" % (tempdir, dirname, sys.executable))
+        status = os.system("cd %s/%s; %s setup.py install --user %s" % (tempdir, dirname, sys.executable, " ".join(extra_opts)))
         if status != 0:
             xit("An error occurred trying to run `setup.py install --user'")
     else:

graalpython/lib-graalpython/posix.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -53,7 +53,7 @@
 
 
 @__builtin__
-def stat(filename, follow_symlinks=False):
+def stat(filename, follow_symlinks=True):
     return stat_result(old_stat(filename, follow_symlinks=follow_symlinks))
 
 

graalpython/lib-graalpython/time.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -44,7 +44,7 @@ def make_struct_time():
     struct_time_type = make_named_tuple_class("struct_time", fields)
 
     class struct_time(struct_time_type):
-        
+
         def __new__(cls, iterable):
             def create_struct(iter, zone, gmtoff):
                 result = tuple.__new__(cls, iter)
@@ -63,7 +63,7 @@ def create_struct(iter, zone, gmtoff):
                 return create_struct(iterable[0:9], iterable[9], None)
             if count == 9:
                 return create_struct(iterable, None, None)
-                
+
 
         def __repr__(self):
             text = "{}(".format(self.__class__.__name__)
@@ -91,3 +91,17 @@ def gmtime(seconds=None):
 @__builtin__
 def localtime(seconds=None):
     return struct_time(__truffle_localtime_tuple__(seconds))
+
+
+@__builtin__
+def asctime(t=None):
+    """
+    asctime([tuple]) -> string
+
+    Convert a time tuple to a string, e.g. 'Sat Jun 06 16:26:11 1998'.
+    When the time tuple is not present, current time as returned by localtime()
+    is used.
+    """
+    if not t:
+        t = localtime()
+    return strftime("%a %b %d %H:%M:%S %Y", t)