From 36dfd12e2c9f4efec35dc44445ec943c8c2da1aa Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 20 Sep 2022 22:46:22 -0700 Subject: [PATCH 1/5] Enable Python 3.11 testing on Linux --- .github/workflows/build.yml | 14 +++++++++----- pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9a15f41..824b7ef5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,10 @@ jobs: python: "3.10" - os: ubuntu-latest python: "3.9" + - os: ubuntu-latest + python: "3.10" + - os: ubuntu-latest + python: "3.11.0-rc.2 - 3.11.0" - os: ubuntu-latest python: "pypy3.8" - os: ubuntu-latest @@ -92,7 +96,7 @@ jobs: - name: Install Python packages run: | python -m pip install --upgrade pip wheel - python -m pip install .[test] + python -m pip install --prefer-binary .[test] - name: Report versions run: | @@ -118,7 +122,7 @@ jobs: strategy: matrix: os: [macos-latest] - python: ["3.9", "3.10"] + python: ["3.9", "3.10"] # 2022-09-20: pikepdf/lxml not available for cp311 env: OS: ${{ matrix.os }} @@ -148,7 +152,7 @@ jobs: - name: Install Python packages run: | python -m pip install --upgrade pip wheel - python -m pip install .[test] + python -m pip install --prefer-binary .[test] - name: Report versions run: | @@ -173,7 +177,7 @@ jobs: strategy: matrix: os: [windows-latest] - python: ["3.9", "3.10"] + python: ["3.9", "3.10"] # 2022-09-20: pikepdf/lxml not available for cp311 env: OS: ${{ matrix.os }} @@ -197,7 +201,7 @@ jobs: - name: Install Python packages run: | python -m pip install --upgrade pip wheel - python -m pip install .[test] + python -m pip install --prefer-binary .[test] - name: Test run: | diff --git a/pyproject.toml b/pyproject.toml index 24ab6659..ce072676 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "img2pdf>=0.3.0", # pure Python "packaging>=20", "pdfminer.six!=20200720,>=20191110", - "pikepdf!=5.0.0,>=4.0.0", + "pikepdf>=5.0.1", "pluggy>=0.13.0", "reportlab>=3.5.66", "tqdm>=4", From c2ccc7f29d1aa0409ac8d924438df31d9bd2c57d Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 20 Sep 2022 23:48:05 -0700 Subject: [PATCH 2/5] Fix test failure due to new logging from pikepdf --- tests/test_validation.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_validation.py b/tests/test_validation.py index 192925f8..6472ad1f 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -98,6 +98,8 @@ def test_output_tty(): def test_report_file_size(tmp_path, caplog): + logging.getLogger('pikepdf._qpdf').setLevel(logging.CRITICAL) # Suppress logging + in_ = tmp_path / 'a.pdf' out = tmp_path / 'b.pdf' pdf = pikepdf.new() From b1fecf3b05b06b8c49dc2352623c72157de7622a Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 20 Sep 2022 23:48:55 -0700 Subject: [PATCH 3/5] Temporarily disable PyPy 3.8 and 3.9 testing Minor pikepdf issue? --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 824b7ef5..e070e5e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,10 @@ jobs: python: "3.10" - os: ubuntu-latest python: "3.11.0-rc.2 - 3.11.0" - - os: ubuntu-latest - python: "pypy3.8" - - os: ubuntu-latest - python: "pypy3.9" + # - os: ubuntu-latest + # python: "pypy3.8" + #- os: ubuntu-latest + # python: "pypy3.9" - os: ubuntu-latest python: "3.9" tesseract5: true From d002703c41568fc8e13fa2898f202f16de76cc23 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Wed, 21 Sep 2022 01:04:34 -0700 Subject: [PATCH 4/5] docker: install gpg-agent --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index f5fcd51d..a520eb4a 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -52,7 +52,7 @@ FROM base # For Tesseract 5 RUN apt-get update && apt-get install -y --no-install-recommends \ - software-properties-common + software-properties-common gpg-agent RUN add-apt-repository -y ppa:alex-p/tesseract-ocr-devel RUN apt-get update && apt-get install -y --no-install-recommends \ From 9cd97da5f24fd8dbaf66b16ecb30e5c94d84720e Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Wed, 21 Sep 2022 02:20:28 -0700 Subject: [PATCH 5/5] dockerfile: toml --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a520eb4a..e23a5232 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -79,7 +79,7 @@ COPY --from=builder /app/misc/webservice.py /app/ COPY --from=builder /app/misc/watcher.py /app/ # Copy minimal project files to get the test suite. -COPY --from=builder /app/setup.cfg /app/setup.py /app/README.md /app/ +COPY --from=builder /app/pyproject.toml /app/README.md /app/ COPY --from=builder /app/tests /app/tests ENTRYPOINT ["/usr/local/bin/ocrmypdf"]