Merge branch 'hpy-import'

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/hpy/version.h

@@ -1,4 +1,4 @@
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.0.3.dev317+ng8fe1487"
-#define HPY_GIT_REVISION "8fe1487"
+#define HPY_VERSION "0.0.3"
+#define HPY_GIT_REVISION "33c8692"

graalpython/lib-graalpython/modules/hpy.devel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpy.devel
-Version: 0.0.3.dev317+ng8fe1487
+Version: 0.0.3
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

graalpython/lib-graalpython/modules/hpy/devel/src/runtime/argparse.c

@@ -150,8 +150,8 @@
  *     used as the error message instead of the default error message. : and ;
  *     are mutually exclusive and whichever occurs first takes precedence.
  *
- * API
- * ---
+ * Argument Parsing API
+ * --------------------
  *
  */
 

graalpython/lib-graalpython/modules/hpy/devel/src/runtime/helpers.c

@@ -28,8 +28,8 @@
  * These are not part of the HPy context or ABI, but are available for
  * HPy extensions to incorporate at compile time.
  *
- * API
- * ---
+ * Runtime Helpers API
+ * -------------------
  *
  */
 

graalpython/lib-graalpython/modules/hpy/devel/version.py

@@ -22,5 +22,5 @@
 # SOFTWARE.
 
 # automatically generated by setup.py:get_scm_config()
-__version__ = "0.0.3.dev317+ng8fe1487"
-__git_revision__ = "8fe1487"
+__version__ = "0.0.3"
+__git_revision__ = "33c8692"

graalpython/lib-graalpython/modules/hpy/test/check_py27_compat.py

@@ -38,11 +38,19 @@
 import py
 
 ROOT = py.path.local(__file__).join('..', '..')
+TEST_DIRS = [ROOT / 'test', ROOT / 'test' / 'debug']
+
+# PyPy does NOT import these files using py2
+PY3_ONLY = ['test_support.py', 'test_handles.py']
 
 def try_import(name):
     try:
-        print('Trying to import %s... ' % name, end='')
-        __import__(name)
+        if isinstance(name, py.path.local):
+            print('Trying to import %s... ' % ROOT.bestrelpath(name), end='')
+            name.pyimport()
+        else:
+            print('Trying to import %s... ' % name, end='')
+            __import__(name)
     except:
         print('ERROR!')
         print()
@@ -71,15 +79,17 @@ def try_import_hpy_devel():
         init_py.remove()
     return failed
 
-def try_import_tests():
+def try_import_tests(dirs):
     failed = 0
-    for t in ROOT.join('test').listdir('test_*.py'):
-        if t.purebasename == 'test_support':
-            continue
-        if not try_import('test.%s' % t.purebasename):
-            failed += 1
+    for d in dirs:
+        for t in d.listdir('test_*.py'):
+            if t.basename in PY3_ONLY:
+                continue
+            if not try_import(t):
+                failed += 1
     return failed
 
+
 def main():
     if sys.version_info[:2] != (2, 7):
         print('ERROR: this script should be run on top of python 2.7')
@@ -88,7 +98,7 @@ def main():
     sys.path.insert(0, str(ROOT))
     failed = 0
     failed += try_import_hpy_devel()
-    failed += try_import_tests()
+    failed += try_import_tests(TEST_DIRS)
     print()
     if failed == 0:
         print('Everything ok!')

graalpython/lib-graalpython/modules/hpy/test/conftest.py

@@ -22,8 +22,8 @@
 # SOFTWARE.
 import sys
 import pytest
-from .support import ExtensionCompiler
-from hpy.debug.pytest import hpy_debug # make it available to all tests
+from .support import ExtensionCompiler, DefaultExtensionTemplate
+from hpy.debug.leakdetector import LeakDetector
 
 GRAALPYTHON_NATIVE = sys.implementation.name == 'graalpython' and __graalpython__.platform_id == 'native'
 
@@ -39,16 +39,27 @@ def hpy_devel(request):
 
 @pytest.fixture(params=['cpython', 'universal', 'debug', 'nfi'] if GRAALPYTHON_NATIVE else ['cpython', 'universal', 'debug'])
 def hpy_abi(request):
-    return request.param
+    abi = request.param
+    if abi == 'debug':
+        with LeakDetector():
+            yield abi
+    else:
+        yield abi
 
 @pytest.fixture
-def compiler(request, tmpdir, hpy_devel, hpy_abi):
+def ExtensionTemplate():
+    return DefaultExtensionTemplate
+
+
+@pytest.fixture
+def compiler(request, tmpdir, hpy_devel, hpy_abi, ExtensionTemplate):
     compiler_verbose = request.config.getoption('--compiler-v')
     return ExtensionCompiler(tmpdir, hpy_devel, hpy_abi,
-                             compiler_verbose=compiler_verbose)
+                             compiler_verbose=compiler_verbose,
+                             ExtensionTemplate=ExtensionTemplate)
 
 @pytest.fixture()
 def skip_nfi(self, hpy_abi):
     # skip all tests in this class for NFI mode
     if hpy_abi == 'nfi':
-        pytest.skip()
+        pytest.skip()