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

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r3043:77d89fb08efb
Date: 2017-10-04 09:15 +0200
http://bitbucket.org/cffi/cffi/changeset/77d89fb08efb/

Log:	hg merge release-1.11

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -12,3 +12,4 @@
 0000000000000000000000000000000000000000 release-0.2
 ca6e81df7f1ea58d891129ad016a8888c08f238b release-0.1
 0000000000000000000000000000000000000000 release-0.1
+ada126bd7d1e96cc76303c1fca64a556912549d8 v1.11.1
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -53,11 +53,13 @@
 
 * https://pypi.python.org/pypi/cffi
 
-   - MD5: ...
+* Checksums of the "source" package version 1.11.1:
 
-   - SHA: ...
+   - MD5: 89dfa1bb3b3e28eafb5da3e345a19f56
 
-   - SHA256: ...
+   - SHA: f3a61a3b53b482a7d05704344e0f055d4672fa01
+
+   - SHA256: 4c40817cc0f71b5351eb0bdd0b585db4a285c2bcc03fbcb961b79bb8086b7576
 
 * Or grab the most current version from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst
--- a/doc/source/whatsnew.rst
+++ b/doc/source/whatsnew.rst
@@ -8,11 +8,11 @@
 
 * Fix tests, remove deprecated C API usage
 
-* Fix for 3.6.0/3.6.1 being incompatible with each other unless we hack
+* Fix (hack) for 3.6.0/3.6.1/3.6.2 giving incompatible binary extensions
   (cpython issue `#29943`_)
 
-* Fix for 3.7.0a1+ (it didn't run successfully in CPython's 3.7 branch)
-  
+* Fix for 3.7.0a1+
+
 .. _`#29943`: https://bugs.python.org/issue29943
 
 
diff --git a/testing/cffi0/test_version.py b/testing/cffi0/test_version.py
--- a/testing/cffi0/test_version.py
+++ b/testing/cffi0/test_version.py
@@ -36,7 +36,7 @@
     v = cffi.__version__.replace('+', '')
     p = os.path.join(parent, 'doc', 'source', 'installation.rst')
     content = open(p).read()
-    assert ("/cffi-%s.tar.gz" % v) in content
+    assert (" package version %s:" % v) in content
 
 def test_setup_version():
     parent = os.path.dirname(os.path.dirname(cffi.__file__))