From 5ec38a4bed1d263356e3590160321abd07469457 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Mon, 2 Jan 2017 18:17:38 -0800
Subject: [PATCH] Update requirements files and documentation for Python 3.6 -
 no code changes

---
 .travis.yml           |  5 +++--
 dev_requirements.txt  | 13 +++++++++----
 docs/installation.rst |  4 ++++
 requirements.txt      |  6 +++---
 setup.py              |  6 +++++-
 test_requirements.txt |  2 +-
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index faa99fdc..c6ce2b7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,9 @@ cache:
         - tests/cache
 
 python:
-    - 3.4
-    - 3.5
+    - "3.4"
+    - "3.5"
+    - "3.6-dev"  # 3.6 not available yet
 
 before_cache:
     - rm -f $HOME/.cache/pip/log/debug.log
diff --git a/dev_requirements.txt b/dev_requirements.txt
index ab16ab10..f707b0e4 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,4 +1,9 @@
-check-manifest>=0.33
-setuptools-scm>=1.11.1
-twine>=1.8.1
-coverage>=4.2
\ No newline at end of file
+check-manifest >= 0.34
+twine >= 1.8.1
+coverage >= 4.3.1
+pytest-xdist >= 1.15.0
+
+# Known good versions: 1.11.1
+# Known broken versions: 1.15.0
+setuptools-scm == 1.11.1
+setuptools-scm-git-archive == 1.0
\ No newline at end of file
diff --git a/docs/installation.rst b/docs/installation.rst
index cdd7da33..dce38235 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -78,6 +78,8 @@ In this worked example, the current working directory contains an input file cal
 
    docker run --rm -v "$(pwd):/home/docker"   ocrmypdf --skip-text test.pdf output.pdf
 
+.. note:: The working directory should be a writable local volume or Docker may not have permission to access it.
+
 Note that ``ocrmypdf`` has its own separate ``-v VERBOSITYLEVEL`` argument to control debug verbosity. All Docker arguments should before the ``ocrmypdf`` image name and all arguments to ``ocrmypdf`` should be listed after.
 
 
@@ -105,6 +107,8 @@ Install or upgrade the required Homebrew packages, if any are missing:
    brew install libxml2 libffi leptonica
    brew install unpaper   # optional
    
+Python 3.4, 3.5 and 3.6 are supported.
+
 Install the required Tesseract OCR engine with the language packs you plan to use:
    
 .. code-block:: bash
diff --git a/requirements.txt b/requirements.txt
index eb8b9f68..6567ba8e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,8 @@
 # setup.py lists a separate set of requirements that are looser to simplify
 # installation
 ruffus==2.6.3
-Pillow==3.3.0
-reportlab==3.2.0
+Pillow==4.0.0
+reportlab==3.3.0
 PyPDF2==1.26
 img2pdf==0.2.1
-cffi==1.5.2
+cffi==1.9.1
diff --git a/setup.py b/setup.py
index 224acbb1..14326f2f 100644
--- a/setup.py
+++ b/setup.py
@@ -196,6 +196,9 @@ setup(
     keywords=['PDF', 'OCR', 'optical character recognition', 'PDF/A', 'scanning'],
     classifiers=[
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: End Users/Desktop",
@@ -211,7 +214,8 @@ setup(
         "Topic :: Text Processing :: Linguistic",
         ],
     setup_requires=[
-        'setuptools_scm',
+        'setuptools-scm',
+        'setuptools-scm-git-archive',
         'cffi>=1.5.0',
         'pytest-runner'
     ],
diff --git a/test_requirements.txt b/test_requirements.txt
index 7a13b208..11dafdd5 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1 +1 @@
-pytest>=2.7.2
+pytest >= 2.7.2