v5 devel branch

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,8 +24,8 @@
 - [ ] This PR changes setup code (`setupsrc/`, `setup.py` etc.).
 - [ ] I have read through relevant doc sections [Installation -> From source][1] and [Setup Magic][2].
 - [ ] I have tested the change does not break internal callers.
-- [ ] I believe the change is maintainable and does not cause unreasonable complexity or code pollution.
-- [ ] The change does not try to shift a maintenance burden or upstream downstream tasks. *Keep handlers generic, avoid overly downstream-specific or (for us) effectively dead code passages.*
+- [ ] I believe the change is maintainable and does not cause unreasonable complexity or code fragmentation.
+- [ ] The change does not shift a maintenance burden or upstream downstream tasks. *Keep handlers generic, avoid overly downstream-specific or (for us) effectively dead code passages.*
 - [ ] I have assessed that the targeted use case cannot reasonably be satisfied by existing means, such as [Caller-provided data files][3], or the change forms a notable improvement over possible alternatives.
 - [ ] I believe the targeted use case is supported by pypdfium2-team. *Note that we may not want to support esoteric or artificially restricted setup envs.*
 

.github/workflows/conda.yaml

@@ -14,6 +14,10 @@ on:
       pdfium_ver:
         default: 'latest'
         type: string
+      new_only:
+        # only with package == "raw", ignored otherwise (actually the default should be false in that case, but I don't know if GH supports dynamic defaults depending on other inputs)
+        default: true
+        type: boolean
       test:
         default: true
         type: boolean
@@ -62,8 +66,15 @@ jobs:
           git config --global user.name "geisserml"
           python -m pip install -U -r req/setup.txt
 
+      # TODO might be able to unify with ${{ inputs.package == 'raw' && inputs.new_only && '--new-only' || '' }} or something
+
       - name: Build package
-        run: ./run craft --pdfium-ver "${{ inputs.pdfium_ver }}" conda_${{ inputs.package }}
+        if: ${{ inputs.package == 'helpers' || !inputs.new_only }}
+        run: ./run craft-conda ${{ inputs.package }} --pdfium-ver ${{ inputs.pdfium_ver }}
+
+      - name: Build package (new only)
+        if: ${{ inputs.package == 'raw' && inputs.new_only }}
+        run: ./run craft-conda ${{ inputs.package }} --pdfium-ver ${{ inputs.pdfium_ver }} --new-only
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -80,8 +91,8 @@ jobs:
       fail-fast: false
       matrix:
         # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
-        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
-        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest', 'ubuntu-24.04-arm', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     runs-on: ${{ matrix.os }}
 
@@ -121,7 +132,7 @@ jobs:
         run: |
           conda install -y pytest pillow numpy
           conda install -y pypdfium2_${{ inputs.package }} --override-channels -c ./conda_dist/ -c pypdfium2-team -c bblanchon -c defaults
-          pytest tests/ tests_old/
+          pytest tests/
 
   publish:
 

.github/workflows/main.yaml

@@ -110,11 +110,13 @@ jobs:
       fail-fast: false
       matrix:
         # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
-        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
-        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest', 'ubuntu-24.04-arm', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         include:
           - os: ubuntu-latest
             wheel: dist/*manylinux_*_x86_64*.whl
+          - os: ubuntu-24.04-arm
+            wheel: dist/*manylinux_*_aarch64*.whl
           - os: macos-13
             wheel: dist/*macosx_*_x86_64*.whl
           - os: macos-14
@@ -222,6 +224,7 @@ jobs:
         with:
           packages-dir: dist/  # the default
 
+      # TODO make sure RELEASE.md is less than 125000 chars, otherwise attach it as an artifact and write a new body pointing out the attachment. We've been hit by this limit in v4.30.1, due to an excessively long pdfium commit log.
       - name: Publish to GitHub
         uses: ncipollo/release-action@v1
         with:
@@ -251,6 +254,7 @@ jobs:
             {
               "package": "helpers",
               "pdfium_ver": "latest",
+              "new_only": "false",
               "test": "true",
               "publish": "${{ inputs.publish }}",
               "py_version": "3.12"

.github/workflows/test_release.yaml

@@ -17,8 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
-        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
-        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest', 'ubuntu-24.04-arm', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/test_setup.yaml

@@ -20,8 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
-        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
-        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest', 'ubuntu-24.04-arm', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/test_sourcebuild.yaml

@@ -19,11 +19,14 @@ jobs:
       fail-fast: false
       matrix:
         # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
-        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        # FIXME Google's toolchain doesn't seem to run on Linux arm64 natively
+        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']  # 'ubuntu-24.04-arm'
         use_syslibs: [false]
         include:
-          - os: ubuntu-latest
+          - os: 'ubuntu-latest'
             use_syslibs: [true]
+          # - os: 'ubuntu-24.04-arm'
+          #   use_syslibs: [true]
 
     runs-on: ${{ matrix.os }}
 
@@ -45,13 +48,13 @@ jobs:
 
       - name: Build PDFium (default)
         if: ${{ !matrix.use_syslibs }}
-        run: python3 ./setupsrc/pypdfium2_setup/build_pdfium.py
+        run: python3 ./setupsrc/pypdfium2_setup/sourcebuild.py
 
       - name: Build PDFium (with syslibs)
         if: ${{ matrix.use_syslibs }}
         run: |
           sudo apt-get install -y libfreetype-dev liblcms2-dev libjpeg-dev libopenjp2-7-dev libpng-dev zlib1g-dev libicu-dev libtiff-dev
-          python3 ./setupsrc/pypdfium2_setup/build_pdfium.py --use-syslibs
+          python3 ./setupsrc/pypdfium2_setup/sourcebuild.py --use-syslibs
 
       - name: Install
         run: PDFIUM_PLATFORM="sourcebuild" python3 -m pip install .

.github/workflows/trigger_conda_raw.yaml

@@ -22,6 +22,7 @@ jobs:
             {
               "package": "raw",
               "pdfium_ver": "latest",
+              "new_only": "true",
               "test": "true",
               "publish": "true",
               "py_version": "3.12"

.github/workflows/trigger_main.yaml

@@ -5,7 +5,8 @@
 
 name: Trigger main release
 on:
-  # NOTE temporarily commented out, awaiting merge of the v5 branch
+  # NOTE temporarily commented out during the beta phase
+  # The beta field in autorelease/config.json is automatically unset after a beta release, but we probably don't want the real release to be auto-triggered - instead it should be triggered intentionally and be supervised by the maintainer.
   # # https://github.com/bblanchon/pdfium-binaries/blob/master/.github/workflows/trigger.yml
   # # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
   # # https://crontab.guru/

.gitignore

@@ -5,7 +5,6 @@ build/
 dist/
 conda/*/out/
 tests/output/
-tests_old/output/
 
 data/
 !data/.gitkeep

.reuse/dep5

@@ -51,8 +51,10 @@ Files:
     tests/resources/attachments.pdf
     tests/resources/mona_lisa.jpg
 Copyright: 2022 PDFium developers
-License: BSD-3-Clause, Apache-2.0
+License: BSD-3-Clause AND Apache-2.0
 Comment:
+    pdfium's LICENSE file includes both BSD-3-Clause and Apache-2.0 texts
+    We're not sure if this meant as SPDX "AND" or "OR", so use the conservative (safe) assumption "AND".
     Obtained from:
     https://pdfium.googlesource.com/pdfium/+/refs/heads/main/testing/resources/bookmarks_circular.pdf
     https://pdfium.googlesource.com/pdfium_tests/+/refs/heads/main/fx/other/8.2_outline.pdf
@@ -67,7 +69,9 @@ Files:
 Copyright:
     2022 PDFium developers
     2024 geisserml <[email protected]>
-License: BSD-3-Clause, Apache-2.0
+License: BSD-3-Clause AND Apache-2.0
+Comment:
+    See above regarding pdfium's double-license.
 
 Files: tests/resources/images.pdf
 Copyright:

.reuse/dep5-wheel

@@ -26,4 +26,7 @@ Copyright:
     2024 PDFium developers
     2024 Developers of projects mentioned in PdfiumThirdParty
     2024 Benoît Blanchon and pdfium-binaries contributors
-License: (BSD-3-Clause, Apache-2.0) AND LicenseRef-PdfiumThirdParty
+License: BSD-3-Clause AND Apache-2.0 AND LicenseRef-PdfiumThirdParty
+Comment:
+    pdfium's LICENSE file includes both BSD-3-Clause and Apache-2.0 texts
+    We're not sure if this meant as SPDX "AND" or "OR", so use the conservative (safe) assumption "AND".