build: adjust pull request again

* Allow flask 2 for webservice.

The breaking changes do not appear to affect it.

* Add shebang to webservice script.

.github/workflows/build.yml

@@ -232,6 +232,7 @@ jobs:
     name: Build Docker images
     needs: [wheel_sdist_linux, test_linux, test_macos, test_windows]
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
     steps:
       - name: Set image tag to release or branch
         run: echo "DOCKER_IMAGE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV

docs/pdfsecurity.rst

@@ -41,8 +41,8 @@ layer. First, it runs all PDFs through
 `pikepdf <https://github.com/pikepdf/pikepdf>`__, a library based on
 `qpdf <https://github.com/qpdf/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.
 

docs/release_notes.rst

@@ -12,11 +12,15 @@ may be unreliable. Use the API to depend on precise behavior.
 The public API may be useful in scripts that launch OCRmyPDF processes or that
 wish to use some of its features for working with PDFs.
 
+v12.3.2
+=======
+
+-  Indicate support for flask 2.x, watcher 2.x (:issue:`815, 816`).
 
 v12.3.1
 =======
 
--  Fixed issue with selection of text when using the hOCR renderer. (:issue:`813`)
+-  Fixed issue with selection of text when using the hOCR renderer (:issue:`813`).
 -  Fixed build errors with the Docker image by upgrading to a newer Ubuntu.
    Also set the timezone of this image to UTC.
 
@@ -24,7 +28,7 @@ v12.3.0
 =======
 
 -  Fixed a regression introduced in Pillow 8.3.0. Pillow no longer rounds DPI
-   for image resolutions. We now account for this. (:issue:`802`)
+   for image resolutions. We now account for this (:issue:`802`).
 -  We no longer use some API calls that are deprecated in the latest versions of
    pikepdf.
 -  Improved error message when a language is requested that doesn't look like a

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
 #

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
 #
@@ -28,16 +29,7 @@ import shlex
 from subprocess import PIPE, run
 from tempfile import TemporaryDirectory
 
-from flask import (
-    Flask,
-    Response,
-    abort,
-    flash,
-    redirect,
-    request,
-    send_from_directory,
-    url_for,
-)
+from flask import Flask, Response, request, send_from_directory
 from werkzeug.utils import secure_filename
 
 app = Flask(__name__)

setup.cfg

@@ -84,9 +84,9 @@ docs =
 extended_test =
     PyMuPDF == 1.13.4
 watcher =
-    watchdog >= 1.0.2, < 2
+    watchdog >= 1.0.2, < 3
 webservice =
-    Flask >= 1, < 2
+    Flask >= 1, < 3
 
 [options.entry_points]
 console_scripts =