[pypy-commit] cffi default: hg merge release-1.2

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2248:060045542075
Date: 2015-08-19 16:12 +0200
http://bitbucket.org/cffi/cffi/changeset/060045542075/

Log:	hg merge release-1.2

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -51,11 +51,11 @@
 
 Download and Installation:
 
-* http://pypi.python.org/packages/source/c/cffi/cffi-1.2.0.tar.gz
+* http://pypi.python.org/packages/source/c/cffi/cffi-1.2.0-1.tar.gz
 
-   - MD5: ...
+   - MD5: 092a40d5e8e8f71742008e28e2b2f803
 
-   - SHA: ...
+   - SHA: 496a9f094b86e09d8a27255f850d7fe3b5115038
 
 * Or grab the most current version from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/testing/cffi1/test_zdist.py b/testing/cffi1/test_zdist.py
--- a/testing/cffi1/test_zdist.py
+++ b/testing/cffi1/test_zdist.py
@@ -327,9 +327,12 @@
 
                 class TestBuildExt(build_ext):
                     def pre_run(self, ext, ffi):
+                        print '_make_setuptools_api: in pre_run:',
                         assert ffi._hi_there == 42
                         assert ext.name == "pack3.mymod"
-                        fn = os.path.join(self.build_temp, '..', '..', 'see_me')
+                        fn = os.path.join(os.path.dirname(self.build_lib),
+                                          '..', 'see_me')
+                        print 'creating %r' % (fn,)
                         open(fn, 'w').close()
 
                 setup(name='example1',