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/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 46f29cf1..7545e4bf 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -3,6 +3,12 @@ RELEASE NOTES OCRmyPDF uses `semantic versioning `_. +v4.3.5: +======= + +- Update documentation to confirm Python 3.6.0 compatibility. No code changes were needed, so many earlier versions are likely supported. + + v4.3.4: ======= diff --git a/dev_requirements.txt b/dev_requirements.txt index e8f36a71..f40c6a1b 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,6 +1,10 @@ -check-manifest >= 0.33 +check-manifest >= 0.34 twine >= 1.8.1 -coverage >= 4.2 +coverage >= 4.3.1 +pytest-xdist >= 1.15.0 GitPython == 2.1.0 -setuptools-scm >= 1.11.1, != 1.13.1 -setuptools_scm_git_archive == 1.0 + +# Known good versions: 1.11.1 +# Known broken versions: 1.15.0 +setuptools-scm == 1.11.1 +setuptools-scm-git-archive == 1.0 diff --git a/docs/installation.rst b/docs/installation.rst index cdd7da33..224c2262 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 @@ -136,6 +140,44 @@ The command line program should now be available: ocrmypdf --help + +Installing on Ubuntu 16.04 LTS +------------------------------ + +No package is currently available for Ubuntu 16.04, but you can install the dependencies manually: + +.. code-block:: bash + + sudo apt-get update + sudo apt-get install \ + unpaper \ + ghostscript \ + tesseract-ocr \ + qpdf \ + python3-pip \ + python3-pil \ + python3-pytest \ + python3-reportlab \ + python3-ruffus \ + python3-cffi + +If you wish install OCRmyPDF to the system Python, then install as follows (note this installs new packages +into your system Python, which could interfere with other programs): + +.. code-block:: bash + + sudo pip3 install ocrmypdf + +If you wish to install OCRmyPDF to a virtual environment to isolate the system Python, you can +follow these steps. + +.. code-block:: bash + + python3 -m venv --system-site-packages venv-ocrmypdf + source venv-ocrmypdf/bin/activate + pip3 install ocrmypdf + + Installing on Ubuntu 14.04 LTS ------------------------------ @@ -153,7 +195,6 @@ Update apt-get: .. code-block:: bash sudo apt-get update - sudo apt-get upgrade Install system dependencies: diff --git a/requirements.txt b/requirements.txt index 9c71d42b..a19ba791 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ Pillow == 3.4.2 reportlab == 3.3.0 PyPDF2 == 1.26 img2pdf == 0.2.1 -cffi == 1.9.1 \ No newline at end of file +cffi == 1.9.1 diff --git a/setup.py b/setup.py index 9f529c06..a1d98980 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", 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