From dc2b161306b3cdbe14a1a53fbeaa3ef315307c12 Mon Sep 17 00:00:00 2001 From: mara004 <65915611+mara004@users.noreply.github.com> Date: Wed, 4 Aug 2021 11:47:34 +0200 Subject: [PATCH 1/3] docs: Add two commas (#809) --- docs/pdfsecurity.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pdfsecurity.rst b/docs/pdfsecurity.rst index 9288e311..a11c84c3 100644 --- a/docs/pdfsecurity.rst +++ b/docs/pdfsecurity.rst @@ -41,8 +41,8 @@ layer. First, it runs all PDFs through `pikepdf `__, a library based on `qpdf `__, a program that repairs PDFs with syntax errors. This is done because, in the author's experience, a -significant number of PDFs in the wild especially those created by -scanners are not well-formed files. qpdf makes it more likely that +significant number of PDFs in the wild, especially those created by +scanners, are not well-formed files. qpdf makes it more likely that OCRmyPDF will succeed, but offers no security guarantees. qpdf is also used to split the PDF into single page PDFs. From b923612323b91360aa06ae15eab104f9635b4372 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Aug 2021 05:48:25 -0400 Subject: [PATCH 2/3] Allow watchdog 2. (#815) * Allow watchdog 2. The breaking change was dropping support for macOS 10.12 and earlier, which doesn't affect us. * Add shebang to watcher script. --- misc/watcher.py | 1 + setup.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/watcher.py b/misc/watcher.py index 68437878..991ee9ac 100644 --- a/misc/watcher.py +++ b/misc/watcher.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # Copyright (C) 2019 Ian Alexander: https://github.com/ianalexander # Copyright (C) 2020 James R Barlow: https://github.com/jbarlow83 # diff --git a/setup.cfg b/setup.cfg index 44435e3f..8b769ba1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -84,7 +84,7 @@ docs = extended_test = PyMuPDF == 1.13.4 watcher = - watchdog >= 1.0.2, < 2 + watchdog >= 1.0.2, < 3 webservice = Flask >= 1, < 2 From 969e54f0e30d53dd2a4692123d9d556d907590c5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Aug 2021 05:49:13 -0400 Subject: [PATCH 3/3] Allow flask 2 for webservice (#816) * Allow flask 2 for webservice. The breaking changes do not appear to affect it. * Add shebang to webservice script. --- misc/webservice.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/webservice.py b/misc/webservice.py index ed2a0374..bfc4a69e 100644 --- a/misc/webservice.py +++ b/misc/webservice.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # webservice.py wrapper for OCRmyPDF # Copyright (C) 2019 James R. Barlow: github.com/jbarlow83 # @@ -36,7 +37,6 @@ from flask import ( redirect, request, send_from_directory, - url_for, ) from werkzeug.utils import secure_filename diff --git a/setup.cfg b/setup.cfg index 8b769ba1..277b577c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -86,7 +86,7 @@ extended_test = watcher = watchdog >= 1.0.2, < 3 webservice = - Flask >= 1, < 2 + Flask >= 1, < 3 [options.entry_points] console_scripts =