Skip to content

Commit

Permalink
Fix CI pipeline by using runner ubuntu-22.04 - cf. #1333 (#1335)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas-C authored Dec 27, 2024
1 parent 4a577df commit 4d59bbe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
scripts/pdfchecker.py --process-all-test-pdf-files
scripts/pdfchecker.py --print-aggregated-report
lint:
runs-on: ubuntu-latest
# Note: there is currently an issue with ubuntu-latest==ubuntu-24.04 / OpenSSL 3.0.13 / oscrypto:
# https://github.com/py-pdf/fpdf2/issues/1333
runs-on: ubuntu-22.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
Expand Down Expand Up @@ -73,7 +75,7 @@ jobs:
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
platform: [ubuntu-latest, windows-latest]
platform: [ubuntu-22.04, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout 🛎️
Expand All @@ -83,12 +85,12 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install system dependencies ⚙️
if: matrix.platform == 'ubuntu-latest'
if: ${{ startsWith(matrix.platform, 'ubuntu') }}
# Ghostscript is needed for test/table/test_table_extraction.py
run: sudo apt-get update --allow-releaseinfo-change && sudo apt-get install ghostscript
- name: Install qpdf ⚙️
# We run the unit tests WITHOUT qpdf for a single parallel execution / Python version:
if: matrix.platform == 'ubuntu-latest' && matrix.python-version != '3.13'
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version != '3.13' }}
run: sudo apt-get update --allow-releaseinfo-change && sudo apt-get install qpdf
- name: Install Python dependencies ⚙️
run: |
Expand All @@ -105,10 +107,10 @@ jobs:
pytest -vv --trace-memory-usage
- name: Upload coverage report to codecov.io ☑
# We only upload coverage ONCE, for a single parallel execution / Python version:
if: matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.13'
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version == '3.13' }}
run: bash <(curl -s https://codecov.io/bash)
- name: Run tests with the minimal versions of fpdf2 direct dependencies ☑
if: matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.8'
if: ${{ startsWith(matrix.platform, 'ubuntu') && matrix.python-version == '3.8' }}
run: |
# Ensuring that those minimal versions remain compatible:
sed -i '/install_requires/,/\n/s/>=/==/' setup.cfg
Expand Down
3 changes: 0 additions & 3 deletions fpdf/drawing.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
import copy, decimal, math, re
from collections import OrderedDict

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

0 comments on commit 4d59bbe

Please sign in to comment.