Commit 3929a15f authored by Armin Rigo's avatar Armin Rigo

hg merge release-1.14

......@@ -28,3 +28,4 @@ bf80722dea36237710083315e336c81bc8571fd0 v1.12.3
4610fa3bd4397721b69acf558b98fbff4c2b4531 v1.14.1
e927dba37deee51b087d1345868c353779a0ebe2 v1.14.2
56a682f7336ddc51b99a04149249a47e928fd129 v1.14.3
ede015a0e6203ba3057f3842063786683caccff6 v1.14.4
......@@ -2,7 +2,7 @@
#include <Python.h>
#include "structmember.h"
#define CFFI_VERSION "1.14.3"
#define CFFI_VERSION "1.14.4"
#ifdef MS_WIN32
#include <windows.h>
......
......@@ -17,7 +17,7 @@ from _cffi_backend import __version__
# ____________________________________________________________
import sys
assert __version__ == "1.14.3", ("This test_c.py file is for testing a version"
assert __version__ == "1.14.4", ("This test_c.py file is for testing a version"
" of cffi that differs from the one that we"
" get from 'import _cffi_backend'")
if sys.version_info < (3,):
......
......@@ -5,8 +5,8 @@ from .api import FFI
from .error import CDefError, FFIError, VerificationError, VerificationMissing
from .error import PkgConfigError
__version__ = "1.14.3"
__version_info__ = (1, 14, 3)
__version__ = "1.14.4"
__version_info__ = (1, 14, 4)
# 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__
......
......@@ -224,7 +224,7 @@ static int _cffi_initialize_python(void)
if (f != NULL && f != Py_None) {
PyFile_WriteString("\nFrom: " _CFFI_MODULE_NAME
"\ncompiled with cffi version: 1.14.3"
"\ncompiled with cffi version: 1.14.4"
"\n_cffi_backend module: ", f);
modules = PyImport_GetModuleDict();
mod = PyDict_GetItemString(modules, "_cffi_backend");
......
......@@ -47,7 +47,7 @@ copyright = u'2012-2018, Armin Rigo, Maciej Fijalkowski'
# The short X.Y version.
version = '1.14'
# The full version, including alpha/beta/rc tags.
release = '1.14.3'
release = '1.14.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -52,13 +52,13 @@ Download and Installation:
* https://pypi.python.org/pypi/cffi
* Checksums of the "source" package version 1.14.3:
* Checksums of the "source" package version 1.14.4:
- MD5: c2a47ffd5d183b193ac8ed3414dcfd07
- MD5: ad3d8537b1516bad6bcdc36c458788be
- SHA: 7199374653c1927e8d3c523b6498b149acdb6f7e
- SHA: 45bd57a0903a2d63b93461e096c5d291875a457b
- SHA256: f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591
- SHA256: 1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c
* Or grab the most current version from the `Heptapod page`_:
``hg clone https://foss.heptapod.net/pypy/cffi``
......
......@@ -191,7 +191,7 @@ Contact
`Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
""",
version='1.14.3',
version='1.14.4',
packages=['cffi'] if cpython else [],
package_data={'cffi': ['_cffi_include.h', 'parse_c_type.h',
'_embedding.h', '_cffi_errors.h']}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment