From 6dc25ddc6e435517cacb06b4390cf69566620d7b Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Fri, 30 Mar 2018 13:22:35 -0700
Subject: [PATCH] v6.1.2: add license to wheels, depend on defusedxml

---
 setup.cfg |  5 ++++-
 setup.py  | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9e2a2df1..c8669a80 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,4 +11,7 @@ ignore =
 [tool:pytest]
 norecursedirs = lib .pc .git output cache resources
 testpaths = tests
-addopts = -n auto
\ No newline at end of file
+addopts = -n auto
+
+[metadata]
+license_file = LICENSE
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 32063501..088de944 100644
--- a/setup.py
+++ b/setup.py
@@ -232,23 +232,24 @@ setup(
         "Topic :: Text Processing :: Indexing",
         "Topic :: Text Processing :: Linguistic",
         ],
-    python_requires='>=3.5',
+    python_requires=' >= 3.5',
     setup_requires=[
-        'setuptools_scm',       # so that version will work
-        'cffi>=1.9.1',          # to build the leptonica module
+        'cffi >= 1.9.1',          # to build the leptonica module
         'pytest-runner'         # to enable python setup.py test
+        'setuptools_scm',       # so that version will work
     ],
     use_scm_version={'version_scheme': 'post-release'},
     cffi_modules=[
         'src/ocrmypdf/lib/compile_leptonica.py:ffibuilder'
     ],
     install_requires=[
-        'ruffus==2.6.3',        # pinned - ocrmypdf implements a 2.6.3 workaround
-        'Pillow>=4.0.0',        # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3
-        'reportlab>=3.3.0',     # oldest released version with sane image handling
-        'PyPDF2>=1.26',         # pure Python, so track HEAD closely
-        'img2pdf>=0.2.3',       # pure Python, so track HEAD closely
-        'cffi>=1.9.1',          # must be a setup and install requirement
+        'cffi >= 1.9.1',          # must be a setup and install requirement
+        'defusedxml >= 0.5.0',    # pure Python, so track HEAD closely
+        'img2pdf >= 0.2.4',       # pure Python, so track HEAD closely
+        'Pillow >= 4.0.0',        # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3
+        'PyPDF2 >= 1.26',         # pure Python, so track HEAD closely
+        'reportlab >= 3.3.0',     # oldest released version with sane image handling
+        'ruffus == 2.6.3',        # pinned - ocrmypdf implements a 2.6.3 workaround
     ],
     extras_require={
         'fitz': ['PyMuPDF >= 1.12.5']     # for table of contents bug