Version 3.27.0rc0

mborsetti · Oct 29, 2024 · 28e8f2b · 28e8f2b
1 parent 39cd8c9
commit 28e8f2b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -120,23 +120,21 @@ jobs:
           python-version: ${{ matrix.python-version }}
           nogil: ${{ matrix.disable-gil }}
 
-      - name: Set PYTHON_GIL
-        if: '${{ matrix.disable-gil }}'
+      - name: Upgrade pip etc.
         run: |
-          echo "PYTHON_GIL=0" >> $GITHUB_ENV
+          pip install --upgrade pip setuptools wheel
 
       - name: Install build dependencies for Python 3.13t for wheel-less lxml (Linux)
         # https://lxml.de/installation.html#installation
-        if: matrix.disable-gil && matrix.python-version == '3.13' && runner.os == 'Linux'
+        if: matrix.disable-gil
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install libxml2-dev libxslt1-dev python3-dev
-          CFLAGS="-O0" pip install lxml
+          sudo apt-get -y install python-lxml
 
-      - name: Upgrade pip etc.
+      - name: Set PYTHON_GIL
+        if: '${{ matrix.disable-gil }}'
         run: |
-          pip install --upgrade pip setuptools wheel
-
+          echo "PYTHON_GIL=0" >> $GITHUB_ENV
 
 #      - name: Install build dependencies for Python 3.10 for wheel-less lxml (Linux)
 #        # https://lxml.de/installation.html#installation
@@ -155,11 +153,16 @@ jobs:
           sudo apt-get -y install python3-dbus build-essential libpoppler-cpp-dev pkg-config python3-dev tesseract-ocr
           pip install --upgrade pdftotext pytesseract
 
-      - name: Install all other dependencies
-#        if: matrix.python-version < '3.12'
+      - name: Install all other dependencies (gil)
+        if: ! matrix.disable-gil
         run: |
           pip install --upgrade coveralls -r requirements.txt -r tests/requirements_pytest.txt
 
+      - name: Install all other dependencies (thread-free)
+        if: matrix.disable-gil
+        run: |
+          pip install --upgrade coveralls -r requirements.txt -r tests/requirements_pytest.txt lxml<=4.8.0-1build1
+
 #      - name: Install all other dependencies (py12)
 #        if: matrix.python-version == '3.12'
 #        run: |

diff --git a/tests/test_docs_filters.py b/tests/test_docs_filters.py
@@ -121,8 +121,11 @@ def test_filter_doc_jobs(job: JobBase) -> None:
     with JobState(None, job) as job_state:  # type: ignore[arg-type]
         for filter_kind, subfilter in FilterBase.normalize_filter_list(job_state.job.filter):
             # skip due to bug
-            if job.url == 'https://example.net/pdf-no-multiple-spaces.pdf' and sys.version_info == (3, 12):
-                pytest.skip(f'Skipping {job.url} due to bug introduced in pypdf 5.1.0 28-oct-24')
+            if job.url == 'https://example.net/pdf-no-multiple-spaces.pdf' and sys.version_info == (3, 13):
+                pytest.skip(
+                    f'Skipping {job.url} due to bug introduced in pypdf 5.1.0 (when other libraries are installed? '
+                    f'28-oct-24'
+                )
             # skip if package is not installed
             if (
                 filter_kind == 'beautify' or filter_kind == 'html2text' and subfilter.get('method') == 'bs4'