diff --git a/.gitignore b/.gitignore index 1e47924e..01577f03 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ venv-3.5/ */test/output bin/ include/ -lib/ +ocrmypdf/lib/_*.py pip-selfcheck.json pyvenv.cfg htmlcov/ @@ -23,4 +23,5 @@ htmlcov/ .ipynb_checkpoints/ tests/cache/ tests/resources/private -ocrmypdf/version.py \ No newline at end of file +ocrmypdf/version.py +.eggs/ \ No newline at end of file diff --git a/ocrmypdf/leptonica.py b/ocrmypdf/leptonica.py index 4e2eaecb..7b3fb67a 100644 --- a/ocrmypdf/leptonica.py +++ b/ocrmypdf/leptonica.py @@ -15,7 +15,7 @@ import os import logging from tempfile import TemporaryFile from ctypes.util import find_library -from ._leptonica import ffi +from .lib._leptonica import ffi lept = ffi.dlopen(find_library('lept')) diff --git a/ocrmypdf/lept.py b/ocrmypdf/lib/compile_leptonica.py similarity index 98% rename from ocrmypdf/lept.py rename to ocrmypdf/lib/compile_leptonica.py index ed8e6295..427ffbb8 100644 --- a/ocrmypdf/lept.py +++ b/ocrmypdf/lib/compile_leptonica.py @@ -1,7 +1,7 @@ from cffi import FFI ffi = FFI() -ffi.set_source("_leptonica", None) +ffi.set_source("ocrmypdf.lib._leptonica", None) ffi.cdef(""" typedef signed char l_int8; typedef unsigned char l_uint8; diff --git a/setup.py b/setup.py index c141ee43..2e21cc1d 100644 --- a/setup.py +++ b/setup.py @@ -206,9 +206,13 @@ setup( "Topic :: Text Processing :: Linguistic", ], setup_requires=[ - 'setuptools_scm' + 'setuptools_scm', + 'cffi>=1.0.0' ], use_scm_version={'version_scheme': 'post-release'}, + cffi_modules=[ + 'ocrmypdf/lib/compile_leptonica.py:ffi' + ], install_requires=[ 'ruffus', 'Pillow',