[GR-17909] CAPI and ginstall

PullRequest: graalpython/631

Author: Franziska Geiger

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

@@ -426,6 +426,10 @@ int PyBuffer_FillInfo(Py_buffer *view, PyObject *obj, void *buf, Py_ssize_t len,
     return 0;
 }
 
+UPCALL_ID(PySequence_DelItem);
+int PySequence_DelItem(PyObject *s, Py_ssize_t i) {
+    return UPCALL_CEXT_I(_jls_PySequence_DelItem, native_to_java(s), i);
+}
 // taken from CPython "Objects/abstract.c"
 static int _IsFortranContiguous(const Py_buffer *view) {
     Py_ssize_t sd, dim;

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

@@ -70,6 +70,10 @@ PyObject* PyEval_GetBuiltins() {
 	return UPCALL_CEXT_O(_jls_PyEval_GetBuiltins);
 }
 
+int PyEval_MergeCompilerFlags(PyCompilerFlags *cf) {
+    return 0;
+}
+
 UPCALL_ID(PyThread_allocate_lock);
 void* PyThread_allocate_lock() {
     return UPCALL_CEXT_O(_jls_PyThread_allocate_lock);

graalpython/lib-graalpython/modules/ginstall.py

@@ -132,8 +132,8 @@ def PyYAML(**kwargs):
     def six(**kwargs):
         install_from_pypi("six==1.12.0", **kwargs)
 
-    def Cython(extra_opts=[], **kwargs):
-        install_from_pypi("Cython==0.29.2", extra_opts=(['--no-cython-compile'] + extra_opts), **kwargs)
+    def Cython(**kwargs):
+        install_from_pypi("Cython==0.29.2", **kwargs)
 
     def setuptools(**kwargs):
         try:
@@ -181,8 +181,13 @@ def Werkzeug(**kwargs):
     #         print("Installing required dependency: pkgconfig")
     #         pkgconfig(**kwargs)
     #     install_from_pypi("h5py==2.9.0", **kwargs)
-
-    # Does not yet work
+    #     try:
+    #         import six
+    #     except ImportError:
+    #         print("Installing required dependency: six")
+    #         pkgconfig(**kwargs)
+    #     install_from_pypi("six==1.12.0", **kwargs)
+    #
     # def keras_applications(**kwargs):
     #     try:
     #         import h5py

graalpython/lib-graalpython/python_cext.py

@@ -111,6 +111,12 @@ def PyModule_SetDocString(module, string):
 def PyModule_NewObject(name):
     return moduletype(name)
 
+##################### ABSTRACT
+
+@may_raise(-1)
+def PySequence_DelItem(o,i):
+    del o[i]
+    return 0
 
 @may_raise
 def PyModule_GetNameObject(module_obj):
@@ -776,7 +782,6 @@ def PyUnicode_AsUnicodeEscapeString(string):
         import _codecs as _codecs_module 
     return _codecs_module.unicode_escape_encode(string)[0]
 
-
 @may_raise(-1)
 def PyUnicode_Tailmatch(s, substr, start, end, direction):
     if direction > 0: