[GR-13074] Install setuptools from source

timfel · timfel · commit a59656ec4513 · 2018-12-18T00:07:27.000-08:00
PullRequest: graalpython/332
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1278,7 +1278,7 @@ public Object next(Object iterator, PNone defaultObject,
                 return next.execute(iterator);
             } catch (PException e) {
                 e.expectAttributeError(errorProfile);
-                throw raise(TypeError, "'%p' object is not an iterator", iterator);
+                throw raise(TypeError, e.getExceptionObject(), "'%p' object is not an iterator", iterator);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java
@@ -328,8 +328,15 @@ public PBytes doit(PZipImporter self, String pathname) {
                 ZipFile zip = new ZipFile(archive);
                 ZipEntry entry = zip.getEntry(key);
                 InputStream in = zip.getInputStream(entry);
-                byte[] bytes = new byte[(int) fileSize];
-                in.read(bytes);
+                int byteSize = (int) fileSize;
+                if (byteSize != fileSize) {
+                    throw raise(PythonErrorType.ZipImportError, "zipimport: cannot read archive members large than 2GB");
+                }
+                byte[] bytes = new byte[byteSize];
+                int bytesRead = 0;
+                while (bytesRead < byteSize) {
+                    bytesRead += in.read(bytes, bytesRead, byteSize - bytesRead);
+                }
                 in.close();
                 return factory().createBytes(bytes);
             } catch (IOException e) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java
@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -62,6 +63,7 @@
 
 public abstract class PNodeWithContext extends Node {
     @Child private PythonObjectFactory factory;
+    @Child private WriteAttributeToObjectNode writeCause;
     @CompilationFinal private ContextReference<PythonContext> contextRef;
 
     protected final PythonObjectFactory factory() {
@@ -88,6 +90,17 @@ public PException raise(LazyPythonClass exceptionType) {
         throw raise(factory().createBaseException(exceptionType));
     }
 
+    public final PException raise(PythonBuiltinClassType type, PBaseException cause, String format, Object... arguments) {
+        assert format != null;
+        PBaseException baseException = factory().createBaseException(type, format, arguments);
+        if (writeCause == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            writeCause = insert(WriteAttributeToObjectNode.create());
+        }
+        writeCause.execute(baseException, SpecialAttributeNames.__CAUSE__, cause);
+        throw raise(baseException);
+    }
+
     public final PException raise(PythonBuiltinClassType type, String format, Object... arguments) {
         assert format != null;
         throw raise(factory().createBaseException(type, format, arguments));
diff --git a/graalpython/lib-graalpython/bytearray.py b/graalpython/lib-graalpython/bytearray.py
@@ -47,3 +47,4 @@ def strip(self, what=None):
 
 
 bytearray.strip = strip
+bytearray.rfind = bytes.rfind
diff --git a/graalpython/lib-graalpython/itertools.py b/graalpython/lib-graalpython/itertools.py
@@ -80,14 +80,14 @@ class starmap():
     """
     def __init__(self, fun, iterable):
         self.fun = fun
-        self.iterable = iterable
+        self.iterable = iter(iterable)
 
     def __iter__(self):
         return self
 
     def __next__(self):
         obj = next(self.iterable)
-        return self.fun(obj)
+        return self.fun(*obj)
 
 
 class islice(object):
diff --git a/graalpython/lib-graalpython/sys.py b/graalpython/lib-graalpython/sys.py
@@ -45,13 +45,13 @@ def make_implementation_info():
     return SimpleNamespace(
         name="graalpython",
         cache_tag="graalpython",
-        version_info=version_info_type(version_info),
+        version=version_info_type(version_info),
         _multiarch=__gmultiarch
     )
 implementation = make_implementation_info()
 del make_implementation_info
 del __gmultiarch
-version_info = implementation.version_info
+version_info = implementation.version
 
 
 def make_flags_class():
diff --git a/graalpython/lib-graalpython/zipimport.py b/graalpython/lib-graalpython/zipimport.py
@@ -39,3 +39,7 @@
 
 import sys
 sys.path_hooks.append(zipimporter)
+
+
+zipimporter.create_module = lambda self, spec: None
+zipimporter.exec_module = lambda self, module: exec(self.get_code(module.__name__), module.__dict__)
diff --git a/graalpython/lib-python/3/distutils/command/install.py b/graalpython/lib-python/3/distutils/command/install.py
@@ -29,8 +29,8 @@
 
 INSTALL_SCHEMES = {
     'unix_prefix': {
-        'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'purelib': '$base/lib-python/$py_version_major/site-packages',
+        'platlib': '$platbase/lib-python/$py_version_major/site-packages',
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -291,6 +291,7 @@ def finalize_options(self):
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
+                            'py_version_major': '%d' % sys.version_info[0],
                             'py_version_short': '%d.%d' % sys.version_info[:2],
                             'py_version_nodot': '%d%d' % sys.version_info[:2],
                             'sys_prefix': prefix,
diff --git a/graalpython/lib-python/3/site-packages/.keep b/graalpython/lib-python/3/site-packages/.keep
diff --git a/graalpython/site-packages/Makefile b/graalpython/site-packages/Makefile
@@ -1,20 +1,30 @@
 .PHONY: clean install
 
-SHELL = /bin/bash
-SITE_PATH = ../lib-python/3/site-packages
-SETUPTOOLS_VERSION = 40.4.3
 
-default: install
+SETUPTOOLS_VERSION = 40.6.3
+PYTHON_VERSION = 3.7
+
+SETUPTOOLS_DIR = setuptools-${SETUPTOOLS_VERSION}
+IN_SETUPTOOLS_DIR = cd ${SETUPTOOLS_DIR} &&
+SITE_PATH = ../lib-python/3/site-packages/
+
 
-install: ${SITE_PATH} ${SITE_PATH}/setuptools.pth
+QUIETLY$(MX_VERBOSE) = @
+OPT_QUIET$(MX_VERBOSE) = --quiet
+OPT_VERBOSE =
 
-${SITE_PATH}:
-	mkdir -p ${SITE_PATH}
+ifeq ($(MX_VERBOSE),y)
+	OPT_VERBOSE = -v
+endif
+
+
+default: install
 
-${SITE_PATH}/setuptools.pth:
-	PYTHONPATH=${SITE_PATH} python3 -m easy_install --always-copy --exclude-scripts --always-unzip --install-dir ${SITE_PATH} setuptools==${SETUPTOOLS_VERSION}
-	find ${SITE_PATH} -name "*.pyc" -exec rm "{}" ";"
-	rm -rf ${SITE_PATH}/__pycache__
+install:
+	$(QUIETLY) mx $(OPT_VERBOSE) python3 -m zipfile -e ${SETUPTOOLS_ZIP} .
+	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 bootstrap.py
+	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 setup.py $(OPT_QUIET) install
 
 clean:
-	rm -rf ${SITE_PATH}
+	$(QUIETLY) rm -rf ${SETUPTOOLS_DIR}
+	$(QUIETLY) rm -rf ${SITE_PATH}/*
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -84,6 +84,12 @@
     #
     # --------------------------------------------------------------------------------------------------------------
     "libraries": {
+        "SETUPTOOLS": {
+            "urls": [
+                "https://github.com/pypa/setuptools/archive/v40.6.3.zip",
+            ],
+            "sha1": "7a5960b8062ddbf0c0e79f806e23785d55fec3c8",
+        }
     },
 
     # --------------------------------------------------------------------------------------------------------------
@@ -242,6 +248,14 @@
             "output": ".",
             "license": ["MIT"],
             "defaultBuild": False,
+            "buildEnv": {
+                "SETUPTOOLS_ZIP": "<path:SETUPTOOLS>",
+            },
+            "buildDependencies": [
+                "SETUPTOOLS",
+                "GRAALPYTHON-LAUNCHER",
+                "GRAALPYTHON",
+            ],
         },
     },
 

Original file line number	Diff line number	Diff line change
`@@ -1278,7 +1278,7 @@ public Object next(Object iterator, PNone defaultObject,`
`1278`	`1278`	`return next.execute(iterator);`
`1279`	`1279`	`} catch (PException e) {`
`1280`	`1280`	`e.expectAttributeError(errorProfile);`
`1281`		`- throw raise(TypeError, "'%p' object is not an iterator", iterator);`
	`1281`	`+ throw raise(TypeError, e.getExceptionObject(), "'%p' object is not an iterator", iterator);`
`1282`	`1282`	`}`
`1283`	`1283`	`}`
`1284`	`1284`
Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,4 @@ def strip(self, what=None):`
`47`	`47`
`48`	`48`
`49`	`49`	`bytearray.strip = strip`
	`50`	`+bytearray.rfind = bytes.rfind`