Author: mattip <[email protected]>
Branch:
Changeset: r76313:95905f4df35a
Date: 2015-03-10 23:08 +0200
http://bitbucket.org/pypy/pypy/changeset/95905f4df35a/
Log: update cffi - fix/skip for win32 and setuptools
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
@@ -165,7 +165,8 @@
assert lib.sin(12.3) == math.sin(12.3)
v = ffi.verifier
ext = v.get_extension()
- assert 'distutils.extension.Extension' in str(ext.__class__)
+ assert 'distutils.extension.Extension' in str(ext.__class__) or \
+ 'setuptools.extension.Extension' in str(ext.__class__)
assert ext.sources == [maybe_relative_path(v.sourcefilename)]
assert ext.name == v.get_module_name()
assert ext.define_macros == [('TEST_EXTENSION_OBJECT', '1')]
@@ -194,7 +195,8 @@
assert lib.test1eoes(7.0) == 42.0
v = ffi.verifier
ext = v.get_extension()
- assert 'distutils.extension.Extension' in str(ext.__class__)
+ assert 'distutils.extension.Extension' in str(ext.__class__) or \
+ 'setuptools.extension.Extension' in str(ext.__class__)
assert ext.sources == [maybe_relative_path(v.sourcefilename),
extra_source]
assert ext.name == v.get_module_name()
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
@@ -4,6 +4,9 @@
import subprocess
from pypy.module.test_lib_pypy.cffi_tests.udir import udir
+if sys.platform == 'win32':
+ py.test.skip('snippets do not run on win32')
+
def create_venv(name):
tmpdir = udir.join(name)
try:
@@ -13,6 +16,20 @@
except OSError as e:
py.test.skip("Cannot execute virtualenv: %s" % (e,))
+ try:
+ deepcopy = os.symlink
+ except:
+ import shutil, errno
+ def deepcopy(src, dst):
+ try:
+ shutil.copytree(src, dst)
+ except OSError as e:
+ if e.errno in (errno.ENOTDIR, errno.EINVAL):
+ shutil.copy(src, dst)
+ else:
+ print 'got errno',e.errno,'not',errno.ENOTDIR
+ raise
+
site_packages = None
for dirpath, dirnames, filenames in os.walk(str(tmpdir)):
if os.path.basename(dirpath) == 'site-packages':
@@ -32,7 +49,7 @@
modules += ('ply',) # needed for older versions of pycparser
for module in modules:
target = imp.find_module(module)[1]
- os.symlink(target, os.path.join(site_packages,
+ deepcopy(target, os.path.join(site_packages,
os.path.basename(target)))
return tmpdir
@@ -51,7 +68,11 @@
python_f.write(py.code.Source(python_snippet))
try:
os.chdir(str(SNIPPET_DIR.join(dirname)))
- vp = str(venv_dir.join('bin/python'))
+ if os.name == 'nt':
+ bindir = 'Scripts'
+ else:
+ bindir = 'bin'
+ vp = str(venv_dir.join(bindir).join('python'))
subprocess.check_call((vp, 'setup.py', 'clean'))
subprocess.check_call((vp, 'setup.py', 'install'))
subprocess.check_call((vp, str(python_f)))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
