More fiddling with version

.gitignore

@@ -23,3 +23,4 @@ htmlcov/
 .ipynb_checkpoints/
 tests/cache/
 tests/resources/private
+ocrmypdf/version.py

ocrmypdf/main.py

@@ -18,7 +18,6 @@ from PIL import Image
 
 from functools import partial
 
-
 from ruffus import transform, suffix, merge, active_if, regex, jobs_limit, \
     formatter, follows, split, collate, check_if_uptodate
 import ruffus.ruffus_exceptions as ruffus_exceptions
@@ -31,15 +30,13 @@ from . import ghostscript
 from . import tesseract
 from . import qpdf
 from . import ExitCode
+from . import version
 
 warnings.simplefilter('ignore', pypdf.utils.PdfReadWarning)
 
 
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
 
-from setuptools_scm import get_version
-VERSION = get_version()
-
 
 # -------------
 # External dependencies
@@ -100,7 +97,7 @@ check_pil_encoder('zlib', 'PNG')
 parser = cmdline.get_argparse(
     prog="ocrmypdf",
     description="Generate searchable PDF file from an image-only PDF file.",
-    version=VERSION,
+    version=version.__version__,
     fromfile_prefix_chars='@',
     ignored_args=[
         'touch_files_only', 'recreate_database', 'checksum_file_name',

requirements.txt

@@ -2,4 +2,4 @@ ruffus>=2.6.3
 Pillow>=2.4.0
 reportlab>=3.1.44
 PyPDF2>=1.25.1
-git+https://github.com/jbarlow83/img2pdf.git@e9bcce0afc3720752ca53a991db93f911a1df709#egg=img2pdf
+git+https://github.com/jbarlow83/img2pdf.git@e9bcce0afc3720752ca53a991db93f911a1df709#egg=img2pdf-0.1.5.dev

setup.py

@@ -3,17 +3,32 @@
 
 from __future__ import print_function, unicode_literals
 from setuptools import setup
-from subprocess import Popen, STDOUT, check_output, CalledProcessError
-from string import Template
+from subprocess import STDOUT, check_output, CalledProcessError
 from collections.abc import Mapping
 import re
 import sys
+import os
 
 
 if sys.version_info < (3, 4):
     print("Python 3.4 or newer is required")
     sys.exit(1)
 
+version_py = os.path.join(os.path.dirname(__file__), 'ocrmypdf', 'version.py')
+try:
+    version_git = check_output(["git", "describe"],
+                               universal_newlines=True).rstrip()
+    version_git = version_git.replace('-g', '+n')
+    version_git = version_git.replace('-', '.dev')
+except Exception:
+    with open(version_py, 'r') as fh:
+        version_git = fh.read().strip().split('=')[-1].replace('"', '')
+
+version_msg = "# Do not edit this file"
+with open(version_py, 'w') as fh:
+    fh.write('\n'.join([version_msg, '__version__="' + version_git + '"']))
+
+
 missing_program = '''
 The program '{program}' could not be executed or was not found on your
 system PATH.
@@ -179,11 +194,11 @@ if 'upload' in sys.argv[1:]:
     print('Use twine to upload the package - setup.py upload is insecure')
     sys.exit(1)
 
-install_requires = open('requirements.txt').read().splitlines()
 tests_require = open('test_requirements.txt').read().splitlines()
 
 setup(
     name='ocrmypdf',
+    version="{ver}".format(ver=version_git),
     description='OCRmyPDF adds an OCR text layer to scanned PDF files, allowing them to be searched',
     url='https://github.com/jbarlow83/OCRmyPDF',
     author='James R. Barlow',
@@ -207,8 +222,13 @@ setup(
         "Topic :: Text Processing :: Indexing",
         "Topic :: Text Processing :: Linguistic",
         ],
-    setup_requires=['setuptools_scm'],
-    install_requires=install_requires,
+    install_requires=[
+        'ruffus',
+        'Pillow',
+        'reportlab',
+        'PyPDF2',
+        'img2pdf'
+    ],
     tests_require=tests_require,
     entry_points={
         'console_scripts': [
@@ -216,5 +236,4 @@ setup(
         ],
     },
     include_package_data=True,
-    use_scm_version=True,
     zip_safe=False)