Author: Armin Rigo <[email protected]>
Branch: release-1.2
Changeset: r2252:0cf51149cdd8
Date: 2015-08-20 23:10 +0200
http://bitbucket.org/cffi/cffi/changeset/0cf51149cdd8/
Log: hg merge default
diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -6298,7 +6298,7 @@
if (v == NULL || PyModule_AddObject(m, "_C_API", v) < 0)
INITERROR;
- v = PyText_FromString("1.2.0");
+ v = PyText_FromString("1.2.1");
if (v == NULL || PyModule_AddObject(m, "__version__", v) < 0)
INITERROR;
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -3438,4 +3438,4 @@
def test_version():
# this test is here mostly for PyPy
- assert __version__ == "1.2.0"
+ assert __version__ == "1.2.1"
diff --git a/cffi/__init__.py b/cffi/__init__.py
--- a/cffi/__init__.py
+++ b/cffi/__init__.py
@@ -4,8 +4,8 @@
from .api import FFI, CDefError, FFIError
from .ffiplatform import VerificationError, VerificationMissing
-__version__ = "1.2.0"
-__version_info__ = (1, 2, 0)
+__version__ = "1.2.1"
+__version_info__ = (1, 2, 1)
# The verifier module file names are based on the CRC32 of a string that
# contains the following version number. It may be older than __version__
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 = '1.2'
# The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
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-1.tar.gz
+* http://pypi.python.org/packages/source/c/cffi/cffi-1.2.1.tar.gz
- - MD5: 092a40d5e8e8f71742008e28e2b2f803
+ - MD5: ...
- - SHA: 496a9f094b86e09d8a27255f850d7fe3b5115038
+ - SHA: ...
* Or grab the most current version 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
@@ -144,7 +144,7 @@
`Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
""",
- version='1.2.0',
+ version='1.2.1',
packages=['cffi'] if cpython else [],
package_data={'cffi': ['_cffi_include.h', 'parse_c_type.h']}
if cpython else {},
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
@@ -320,19 +320,20 @@
ffi._hi_there = 42
""")
with open("setup.py", "w") as f:
- f.write("""if 1:
+ f.write("from __future__ import print_function\n"
+ """if 1:
from setuptools import setup
from distutils.command.build_ext import build_ext
import os
class TestBuildExt(build_ext):
def pre_run(self, ext, ffi):
- print '_make_setuptools_api: in pre_run:',
+ print('_make_setuptools_api: in pre_run:', end=" ")
assert ffi._hi_there == 42
assert ext.name == "pack3.mymod"
fn = os.path.join(os.path.dirname(self.build_lib),
'..', 'see_me')
- print 'creating %r' % (fn,)
+ print('creating %r' % (fn,))
open(fn, 'w').close()
setup(name='example1',
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
