cffi, do not use deprecated verify()

jdavid · jdavid · commit 492bc5a82063 · 2019-04-19T20:24:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.cache/
+/.eggs/
 /.tox/
 /build/
 /dist/
diff --git a/Makefile b/Makefile
@@ -0,0 +1,4 @@
+.PHONY: build
+
+build:
+	python setup.py build_ext --inplace
diff --git a/docs/development.rst b/docs/development.rst
@@ -15,6 +15,7 @@ Unit tests
 
     $ git clone git://github.com/libgit2/pygit2.git
     $ cd pygit2
+    $ python setup.py build_ext --inplace
     $ pytest test
 
 Coding style: documentation strings
diff --git a/pygit2/ffi.py b/pygit2/ffi.py
@@ -29,8 +29,4 @@
 from __future__ import absolute_import
 
 # Import from pygit2
-try:
-    from ._libgit2 import ffi, lib as C
-except ImportError:
-    from ._run import ffi, preamble, C_KEYWORDS
-    C = ffi.verify(preamble, **C_KEYWORDS)
+from ._libgit2 import ffi, lib as C
diff --git a/setup.py b/setup.py
@@ -131,15 +131,11 @@ def run(self):
 if os.name == 'nt':
     cmdclass['build'] = BuildWithDLLs
 
-extra_args = {
-    'cffi_modules': ['pygit2/_run.py:ffi'],
-    'ext_modules': [
-        Extension('_pygit2', pygit2_exts, libraries=['git2'],
-                  include_dirs=[libgit2_include],
-                  library_dirs=[libgit2_lib]),
-        # FFI is added in the build step
-    ],
-}
+ext_modules = [
+    Extension('_pygit2', pygit2_exts, libraries=['git2'],
+              include_dirs=[libgit2_include],
+              library_dirs=[libgit2_lib]),
+]
 
 setup(name='pygit2',
       description='Python bindings for libgit2.',
@@ -157,4 +153,6 @@ def run(self):
       install_requires=['cffi', 'six'],
       zip_safe=False,
       cmdclass=cmdclass,
-      **extra_args)
+      cffi_modules=['pygit2/_run.py:ffi'],
+      ext_modules=ext_modules,
+)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`/.cache/`
	`2`	`+/.eggs/`
`2`	`3`	`/.tox/`
`3`	`4`	`/build/`
`4`	`5`	`/dist/`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +.PHONY: build
++
 +build:
 +	python setup.py build_ext --inplace