Skip to content

Commit

Permalink
Merge branch 'feature/py311'
Browse files Browse the repository at this point in the history
  • Loading branch information
jbarlow83 committed Sep 21, 2022
2 parents 7da4e6c + 9cd97da commit 7bd0e43
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ jobs:
- os: ubuntu-latest
python: "3.9"
- os: ubuntu-latest
python: "pypy3.8"
python: "3.10"
- os: ubuntu-latest
python: "pypy3.9"
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: "3.9"
tesseract5: true
Expand Down Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down Expand Up @@ -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: |
Expand All @@ -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 }}
Expand All @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions tests/test_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 7bd0e43

Please sign in to comment.