Avoid circular imports for __version__

This commit is contained in:
James R. Barlow
2019-07-27 05:02:19 -07:00
parent 5f00e4f9d8
commit eb104b405d
5 changed files with 32 additions and 14 deletions
+1 -9
View File
@@ -15,16 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with OCRmyPDF. If not, see <http://www.gnu.org/licenses/>.
import pkg_resources
PROGRAM_NAME = 'ocrmypdf'
# Official PEP 396
__version__ = pkg_resources.get_distribution('ocrmypdf').version
VERSION = __version__
from . import helpers, hocrtransform, leptonica, pdfa, pdfinfo
from ._version import PROGRAM_NAME, __version__
from .api import Verbosity, configure_logging, ocr
from .exceptions import (
BadArgsError,
+3 -1
View File
@@ -26,7 +26,9 @@ import pikepdf
from pikepdf.models.metadata import encode_pdf_date
from PIL import Image
from . import PROGRAM_NAME, VERSION, leptonica
from . import leptonica
from ._version import PROGRAM_NAME
from ._version import __version__ as VERSION
from .exceptions import (
DpiError,
EncryptedPdfError,
-1
View File
@@ -27,7 +27,6 @@ from tempfile import mkdtemp
from tqdm import tqdm
from . import __version__
from ._graft import OcrGrafter
from ._jobcontext import PDFContext, cleanup_working_files, make_logger
from ._pipeline import (
+24
View File
@@ -0,0 +1,24 @@
# © 2017 James R. Barlow: github.com/jbarlow83
#
# This file is part of OCRmyPDF.
#
# OCRmyPDF is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OCRmyPDF is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OCRmyPDF. If not, see <http://www.gnu.org/licenses/>.
import pkg_resources
PROGRAM_NAME = 'ocrmypdf'
# Official PEP 396
__version__ = pkg_resources.get_distribution('ocrmypdf').version
+4 -3
View File
@@ -17,7 +17,8 @@
import argparse
from . import PROGRAM_NAME, VERSION
from ._version import PROGRAM_NAME as _PROGRAM_NAME
from ._version import __version__ as _VERSION
def numeric(basetype, min_=None, max_=None):
@@ -54,7 +55,7 @@ class ArgumentParser(argparse.ArgumentParser):
parser = ArgumentParser(
prog=PROGRAM_NAME,
prog=_PROGRAM_NAME,
fromfile_prefix_chars='@',
formatter_class=argparse.RawDescriptionHelpFormatter,
description="""\
@@ -167,7 +168,7 @@ parser.add_argument(
parser.add_argument(
'--version',
action='version',
version=VERSION,
version=_VERSION,
help="Print program version and exit",
)