Skip to content

Commit 4d59bbe

Browse files
authored
Fix CI pipeline by using runner ubuntu-22.04 - cf. #1333 (#1335)
1 parent 4a577df commit 4d59bbe

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/continuous-integration-workflow.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ jobs:
3434
scripts/pdfchecker.py --process-all-test-pdf-files
3535
scripts/pdfchecker.py --print-aggregated-report
3636
lint:
37-
runs-on: ubuntu-latest
37+
# Note: there is currently an issue with ubuntu-latest==ubuntu-24.04 / OpenSSL 3.0.13 / oscrypto:
38+
# https://github.com/py-pdf/fpdf2/issues/1333
39+
runs-on: ubuntu-22.04
3840
steps:
3941
- name: Checkout 🛎️
4042
uses: actions/checkout@v4
@@ -73,7 +75,7 @@ jobs:
7375
strategy:
7476
matrix:
7577
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
76-
platform: [ubuntu-latest, windows-latest]
78+
platform: [ubuntu-22.04, windows-latest]
7779
runs-on: ${{ matrix.platform }}
7880
steps:
7981
- name: Checkout 🛎️
@@ -83,12 +85,12 @@ jobs:
8385
with:
8486
python-version: ${{ matrix.python-version }}
8587
- name: Install system dependencies ⚙️
86-
if: matrix.platform == 'ubuntu-latest'
88+
if: ${{ startsWith(matrix.platform, 'ubuntu') }}
8789
# Ghostscript is needed for test/table/test_table_extraction.py
8890
run: sudo apt-get update --allow-releaseinfo-change && sudo apt-get install ghostscript
8991
- name: Install qpdf ⚙️
9092
# We run the unit tests WITHOUT qpdf for a single parallel execution / Python version:
91-
if: matrix.platform == 'ubuntu-latest' && matrix.python-version != '3.13'
93+
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version != '3.13' }}
9294
run: sudo apt-get update --allow-releaseinfo-change && sudo apt-get install qpdf
9395
- name: Install Python dependencies ⚙️
9496
run: |
@@ -105,10 +107,10 @@ jobs:
105107
pytest -vv --trace-memory-usage
106108
- name: Upload coverage report to codecov.io ☑
107109
# We only upload coverage ONCE, for a single parallel execution / Python version:
108-
if: matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.13'
110+
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version == '3.13' }}
109111
run: bash <(curl -s https://codecov.io/bash)
110112
- name: Run tests with the minimal versions of fpdf2 direct dependencies ☑
111-
if: matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.8'
113+
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version == '3.8' }}
112114
run: |
113115
# Ensuring that those minimal versions remain compatible:
114116
sed -i '/install_requires/,/\n/s/>=/==/' setup.cfg

fpdf/drawing.py

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import copy, decimal, math, re
1010
from collections import OrderedDict
1111

12-
# disable import error temporarily until pylint fixed colections.abc issue with python 3.13
13-
# https://github.com/pylint-dev/pylint/issues/10112
14-
# pylint: disable=import-error
1512
from collections.abc import Sequence
1613
from contextlib import contextmanager
1714
from typing import Optional, NamedTuple, Union

0 commit comments

Comments
 (0)