Use qpdf 8.0.2 backport, force old pytest-timeout to fix build

This change happened sometime after the 4.0.0-beta1 release in
Ubuntu 18.04

.docker/Dockerfile

@@ -4,6 +4,7 @@ FROM      ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   ocrmypdf \
+  unpaper \
   tesseract-ocr-eng \
   tesseract-ocr-fra \
   tesseract-ocr-deu \

.github/ISSUE_TEMPLATE

@@ -2,11 +2,4 @@ Please include the command line and a test file with your issue report.
 
 If possible, please use a test file that we can include in future test cases (no personal information, no copyrighted material).
 
-If you wish to encrypt a test file so that only the maintainer of OCRmyPDF can view it, you may use:
+If you wish to encrypt a test file for the OCRmyPDF maintainer only, see the [Wiki](https://github.com/jbarlow83/OCRmyPDF/wiki).
-
-```bash
-
-gpg --recv-keys 4434eb74c4a35f7f --keyserver pgp.mit.edu
-gpg --output test.pdf.gpg --encrypt --receipient 4434eb74c4a35f7f test.pdf
-
-```

.gitignore

@@ -8,6 +8,7 @@ tasks.py
 .ruffus_history.sqlite
 .idea/
 .pytest_cache/
+.pylintrc
 
 # Package building
 *.egg-info/
@@ -42,3 +43,4 @@ pdfbox-app*.jar
 .vscode/
 IDEAS
 _Dockerfile.local
+/scratch.py

.travis/linux_before_install.sh

@@ -12,7 +12,8 @@ sudo apt-get install -y \
 	libavformat56 \
 	libavcodec56 \
 	libavutil54 \
-	libffi-dev
+	libffi-dev \
+	qpdf
 
 sudo add-apt-repository ppa:alex-p/tesseract-ocr -y
 
@@ -28,15 +29,3 @@ pip install --upgrade pip
 mkdir -p packages
 wget -q 'https://www.dropbox.com/s/vaq0kbwi6e6au80/unpaper_6.1-1.deb?raw=1' -O packages/unpaper_6.1-1.deb
 sudo dpkg -i packages/unpaper_6.1-1.deb
-
-if [ ! -f /usr/local/bin/qpdf ]; then
-	export QPDF_RELEASE='https://github.com/qpdf/qpdf/releases/download/release-qpdf-8.0.2/qpdf-8.0.2.tar.gz'
-	mkdir qpdf
-    wget -q $QPDF_RELEASE -O - | tar xz -C qpdf --strip-components=1
-    cd qpdf/
-	export PATH="/usr/local/opt/ccache/libexec:$PATH"
-    ./configure --prefix=/usr
-    make -j 2
-    sudo make install
-    cd ..
-fi

docs/cookbook.rst

@@ -65,8 +65,8 @@ By default OCRmyPDF assumes the document is English.
 
 .. code-block:: bash
 
-    ocrmypdf -l fre LeParisien.pdf LeParisien.pdf
+    ocrmypdf -l fra LeParisien.pdf LeParisien.pdf
-    ocrmypdf -l eng+fre Bilingual-English-French.pdf Bilingual-English-French.pdf
+    ocrmypdf -l eng+fra Bilingual-English-French.pdf Bilingual-English-French.pdf
 
 Language packs must be installed for all languages specified. See :ref:`Installing additional language packs <lang-packs>`.
 

docs/release_notes.rst

@@ -9,6 +9,13 @@ The OCRmyPDF package itself does not contain a public API, although it is fairly
    find:    [^`]\#([0-9]{1,3})[^0-9]
    replace: `#$1 <https://github.com/jbarlow83/OCRmyPDF/issues/$1>`_
 
+
+v6.2.1
+------
+
+-   Fix recent versions of Tesseract (after 4.0.0-beta1) not being detected as supporting the ``sandwich`` renderer (`#271 <https://github.com/ppjbarlow83/OCRmyPDF/issues/271>`_).
+
+
 v6.2.0
 ------
 

src/ocrmypdf/exec/tesseract.py

@@ -73,7 +73,8 @@ def has_textonly_pdf():
     """
     args_tess = [
         'tesseract',
-        '--print-parameters'
+        '--print-parameters',
+        'pdf'
     ]
     params = ''
     try:

test_requirements.txt

@@ -2,4 +2,4 @@ pytest >= 3.2
 pytest-helpers-namespace
 pytest-xdist
 pytest-cov
-pytest-timeout
+pytest-timeout == 1.2.1