Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
PyPy
cffi
Commits
a8ccf4c871e3
Commit
3929a15f
authored
Nov 24, 2020
by
Armin Rigo
Browse files
Options
Browse Files
Download
Plain Diff
hg merge release-1.14
parents
ea0cf21caf95
1131540f3dd2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
11 deletions
+12
-11
.hgtags
.hgtags
+1
-0
c/_cffi_backend.c
c/_cffi_backend.c
+1
-1
c/test_c.py
c/test_c.py
+1
-1
cffi/__init__.py
cffi/__init__.py
+2
-2
cffi/_embedding.h
cffi/_embedding.h
+1
-1
doc/source/conf.py
doc/source/conf.py
+1
-1
doc/source/installation.rst
doc/source/installation.rst
+4
-4
setup.py
setup.py
+1
-1
No files found.
.hgtags
View file @
a8ccf4c8
...
...
@@ -28,3 +28,4 @@ bf80722dea36237710083315e336c81bc8571fd0 v1.12.3
4610fa3bd4397721b69acf558b98fbff4c2b4531 v1.14.1
e927dba37deee51b087d1345868c353779a0ebe2 v1.14.2
56a682f7336ddc51b99a04149249a47e928fd129 v1.14.3
ede015a0e6203ba3057f3842063786683caccff6 v1.14.4
c/_cffi_backend.c
View file @
a8ccf4c8
...
...
@@ -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>
...
...
c/test_c.py
View file @
a8ccf4c8
...
...
@@ -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
,):
...
...
cffi/__init__.py
View file @
a8ccf4c8
...
...
@@ -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__
...
...
cffi/_embedding.h
View file @
a8ccf4c8
...
...
@@ -224,7 +224,7 @@ static int _cffi_initialize_python(void)
if
(
f
!=
NULL
&&
f
!=
Py_None
)
{
PyFile_WriteString
(
"
\n
From: "
_CFFI_MODULE_NAME
"
\n
compiled with cffi version: 1.14.
3
"
"
\n
compiled with cffi version: 1.14.
4
"
"
\n
_cffi_backend module: "
,
f
);
modules
=
PyImport_GetModuleDict
();
mod
=
PyDict_GetItemString
(
modules
,
"_cffi_backend"
);
...
...
doc/source/conf.py
View file @
a8ccf4c8
...
...
@@ -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.
...
...
doc/source/installation.rst
View file @
a8ccf4c8
...
...
@@ -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:
719
93
7
46
53c1927e8d3c523b6498b149acdb6f7e
- SHA:
45bd57a0903a2d63b
9346
1e096c5d291875a457b
- SHA256:
f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591
- SHA256:
1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c
* Or grab the most current version from the `Heptapod page`_:
``hg clone https://foss.heptapod.net/pypy/cffi``
...
...
setup.py
View file @
a8ccf4c8
...
...
@@ -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'
]}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment