Commit 93f7c04f authored by Matt Davis's avatar Matt Davis

hg merge release-1.14

......@@ -30,3 +30,4 @@ e927dba37deee51b087d1345868c353779a0ebe2 v1.14.2
56a682f7336ddc51b99a04149249a47e928fd129 v1.14.3
ede015a0e6203ba3057f3842063786683caccff6 v1.14.4
870af0b7cdf9dfae2d582158b4bfcda96987c42e v1.14.4-1
5d7f0abff7958b650a51e652d0cf19823eb92ff0 v1.14.5
......@@ -2,7 +2,7 @@
#include <Python.h>
#include "structmember.h"
#define CFFI_VERSION "1.14.4"
#define CFFI_VERSION "1.14.5"
#ifdef MS_WIN32
#include <windows.h>
......
......@@ -17,7 +17,7 @@ from _cffi_backend import __version__
# ____________________________________________________________
import sys
assert __version__ == "1.14.4", ("This test_c.py file is for testing a version"
assert __version__ == "1.14.5", ("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.4"
__version_info__ = (1, 14, 4)
__version__ = "1.14.5"
__version_info__ = (1, 14, 5)
# 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.4"
"\ncompiled with cffi version: 1.14.5"
"\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.4'
release = '1.14.5'
# 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.4:
* Checksums of the "source" package version 1.14.5:
- MD5: ad3d8537b1516bad6bcdc36c458788be
- MD5: 272cb183bf0365530e3c0d8f446cd89d
- SHA: 45bd57a0903a2d63b93461e096c5d291875a457b
- SHA1: 21cdeccd7b7b121d35eae1b8e91d78f9ec83da98
- SHA256: 1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c
- SHA256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c
* Or grab the most current version from the `Heptapod page`_:
``hg clone https://foss.heptapod.net/pypy/cffi``
......
......@@ -3,6 +3,14 @@ What's New
======================
v1.14.5
=======
* Source fix for old gcc versions
* This and future releases should include wheels on more platforms,
thanks to our new release managers Matt and Matt!
v1.14.4
=======
......
......@@ -187,7 +187,7 @@ Contact
`Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
""",
version='1.14.4',
version='1.14.5',
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