[pypy-commit] cffi release-0.8: Merge for release 0.8.1

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: release-0.8
Changeset: r1426:ec9d113aaf26
Date: 2013-11-24 14:13 +0100
http://bitbucket.org/cffi/cffi/changeset/ec9d113aaf26/

Log:	Merge for release 0.8.1

diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 recursive-include cffi *.py
-recursive-include c *.c *.h *.asm *.py
+recursive-include c *.c *.h *.asm *.py win64.obj
 recursive-include testing *.py
 recursive-include doc *.py *.rst Makefile *.bat
 recursive-include demo py.cleanup *.py
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -1097,7 +1097,9 @@
     assert strlenaddr == cast(BVoidP, strlen)
 
 def test_read_variable():
-    if sys.platform == 'win32' or sys.platform == 'darwin':
+    ## FIXME: this test assumes glibc specific behavior, it's not compliant with C standard
+    ## https://bugs.pypy.org/issue1643
+    if sys.platform == 'win32' or sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
         py.test.skip("untested")
     BVoidP = new_pointer_type(new_void_type())
     ll = find_and_load_library('c')
@@ -1105,7 +1107,9 @@
     assert stderr == cast(BVoidP, _testfunc(8))
 
 def test_read_variable_as_unknown_length_array():
-    if sys.platform == 'win32' or sys.platform == 'darwin':
+    ## FIXME: this test assumes glibc specific behavior, it's not compliant with C standard
+    ## https://bugs.pypy.org/issue1643
+    if sys.platform == 'win32' or sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
         py.test.skip("untested")
     BCharP = new_pointer_type(new_primitive_type("char"))
     BArray = new_array_type(BCharP, None)
@@ -1115,7 +1119,9 @@
     # ^^ and not 'char[]', which is basically not allowed and would crash
 
 def test_write_variable():
-    if sys.platform == 'win32' or sys.platform == 'darwin':
+    ## FIXME: this test assumes glibc specific behavior, it's not compliant with C standard
+    ## https://bugs.pypy.org/issue1643
+    if sys.platform == 'win32' or sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
         py.test.skip("untested")
     BVoidP = new_pointer_type(new_void_type())
     ll = find_and_load_library('c')
diff --git a/cffi/__init__.py b/cffi/__init__.py
--- a/cffi/__init__.py
+++ b/cffi/__init__.py
@@ -4,5 +4,5 @@
 from .api import FFI, CDefError, FFIError
 from .ffiplatform import VerificationError, VerificationMissing
 
-__version__ = "0.8"
-__version_info__ = (0, 8)
+__version__ = "0.8.1"
+__version_info__ = (0, 8, 1)
diff --git a/doc/source/conf.py b/doc/source/conf.py
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.8'
+release = '0.8.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/index.rst b/doc/source/index.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -88,13 +88,13 @@
 
 Download and Installation:
 
-* http://pypi.python.org/packages/source/c/cffi/cffi-0.8.tar.gz
+* http://pypi.python.org/packages/source/c/cffi/cffi-0.8.1.tar.gz
 
    - Or grab the most current version by following the instructions below.
 
-   - MD5: e61deb0515311bb42d5d58b9403bc923
+   - MD5: ...
 
-   - SHA: 8332429193cb74d74f3347af180b448425d7d176
+   - SHA: ...
 
 * Or get it from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -48,9 +48,14 @@
     try:
         compiler.compile(['c/check__thread.c'])
     except distutils.errors.CompileError:
-        print >> sys.stderr, "will not use '__thread' in the C code"
+        sys.stderr.write("the above error message can be safely ignored;\n")
+        sys.stderr.write("will not use '__thread' in the C code\n")
     else:
         define_macros.append(('USE__THREAD', None))
+    try:
+        os.unlink('c/check__thread.o')
+    except OSError:
+        pass
 
 def use_pkg_config():
     _ask_pkg_config(include_dirs,       '--cflags-only-I', '-I', sysroot=True)
@@ -102,7 +107,7 @@
 
 `Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
     """,
-    version='0.8',
+    version='0.8.1',
     packages=['cffi'],
     zip_safe=False,
 
diff --git a/testing/test_verify.py b/testing/test_verify.py
--- a/testing/test_verify.py
+++ b/testing/test_verify.py
@@ -1637,7 +1637,11 @@
         #include <malloc.h>
         #define alloca _alloca
         #else
-        #include <alloca.h>
+        # ifdef __FreeBSD__
+        #  include <stdlib.h>
+        # else
+        #  include <alloca.h>
+        # endif
         #endif
         static int (*python_callback)(int how_many, int *values);
         static int c_callback(int how_many, ...) {
diff --git a/testing/test_version.py b/testing/test_version.py
--- a/testing/test_version.py
+++ b/testing/test_version.py
@@ -9,6 +9,7 @@
     '0.4.2': '0.4',     # did not change
     '0.7.1': '0.7',     # did not change
     '0.7.2': '0.7',     # did not change
+    '0.8.1': '0.8',     # did not change
     }
 
 def test_version():