openstack/deb-python-pygit2
Code Issues Proposed changes

Add support for cffi-pre-1.0

Browse Source
This commit is contained in:
Nicolas Dandrimont
2015-09-09 22:25:20 +02:00
parent 29a8dbc6b2
commit ec23762c09
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pygit2/ffi.py
View File

@@ -32,5 +32,5 @@ from __future__ import absolute_import
try: try:
from ._libgit2 import ffi, lib as C from ._libgit2 import ffi, lib as C
except ImportError: except ImportError:
from .libgit2_build import ffi, C_HEADER_SRC, C_KEYWORDS from .libgit2_build import ffi, preamble, C_KEYWORDS
C = ffi.verify(C_HEADER_SRC, **C_KEYWORDS) C = ffi.verify(preamble, **C_KEYWORDS)

32
setup.py
View File

@@ -45,9 +45,16 @@ from subprocess import Popen, PIPE
import sys import sys
import unittest import unittest
# Get cffi major version
import cffi
cffi_major_version = cffi.__version_info__[0]
# Import stuff from pygit2/_utils.py without loading the whole pygit2 package # Import stuff from pygit2/_utils.py without loading the whole pygit2 package
sys.path.insert(0, 'pygit2') sys.path.insert(0, 'pygit2')
from libgit2_build import __version__, get_libgit2_paths from libgit2_build import __version__, get_libgit2_paths
if cffi_major_version == 0:
from libgit2_build import ffi, preamble, C_KEYWORDS
ffi.verify(preamble, **C_KEYWORDS)
del sys.path[0] del sys.path[0]
# Python 2 support # Python 2 support
@@ -163,6 +170,21 @@ class BuildWithDLLs(build):
if os.name == 'nt': if os.name == 'nt':
cmdclass['build'] = BuildWithDLLs cmdclass['build'] = BuildWithDLLs
extra_args = {
'ext_modules': [
Extension('_pygit2', pygit2_exts, libraries=['git2'],
include_dirs=[libgit2_include],
library_dirs=[libgit2_lib]),
# FFI is added in the build step
],
}
if cffi_major_version == 0:
extra_args['ext_modules'].append(ffi.verifier.get_extension())
else:
extra_args['cffi_modules']=['pygit2/libgit2_build.py:ffi']
setup(name='pygit2', setup(name='pygit2',
description='Python bindings for libgit2.', description='Python bindings for libgit2.',
keywords='git', keywords='git',
@@ -175,14 +197,8 @@ setup(name='pygit2',
long_description=long_description, long_description=long_description,
packages=['pygit2'], packages=['pygit2'],
package_data={'pygit2': ['decl.h']}, package_data={'pygit2': ['decl.h']},
cffi_modules=['pygit2/libgit2_build.py:ffi'],
setup_requires=['cffi'], setup_requires=['cffi'],
install_requires=['cffi'], install_requires=['cffi'],
zip_safe=False, zip_safe=False,
ext_modules=[ cmdclass=cmdclass,
Extension('_pygit2', pygit2_exts, libraries=['git2'], **extra_args)
include_dirs=[libgit2_include],
library_dirs=[libgit2_lib]),
# FFI is added in the build step
],
cmdclass=cmdclass)