Merge branch 'main' into scandir

Author: AyanSinhaMahapatra

.github/workflows/docs-ci.yml

@@ -4,19 +4,19 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/pypi-release.yml

@@ -21,14 +21,14 @@ on:
 jobs:
   build-pypi-distribs:
     name: Build and publish library to PyPI
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Install pypa/build
         run: python -m pip install build --user
@@ -37,7 +37,7 @@ jobs:
         run: python -m build --sdist --wheel --outdir dist/
 
       - name: Upload built archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pypi_archives
           path: dist/*
@@ -47,17 +47,17 @@ jobs:
     name: Create GH release
     needs:
       - build-pypi-distribs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: pypi_archives
           path: dist
 
       - name: Create GH release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           files: dist/*
@@ -67,11 +67,11 @@ jobs:
     name: Create PyPI release
     needs:
       - create-gh-release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: pypi_archives
           path: dist

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Release notes
 =============
 
+Version 32.2.0 - (2025-02-15)
+-----------------------------
+
+- Adjust as_unicode for breaking bs4 4.13 changes
+  See https://github.com/aboutcode-org/commoncode/issues/79
+- Add support for python 3.13
+- Drop deprecated CI runners and update CI runners to latest
 
 Version 32.1.0 - (2024-12-06)
 -----------------------------

azure-pipelines.yml

@@ -9,51 +9,51 @@ jobs:
   # These jobs are using VMs and Azure-provided Pythons 3.8
   ################################################################################
 
-  - template: etc/ci/azure-posix.yml
-    parameters:
-      job_name: ubuntu20_cpython
-      image_name: ubuntu-20.04
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
-      test_suites:
-        all: venv/bin/pytest -n 2 -vvs
-
   - template: etc/ci/azure-posix.yml
     parameters:
       job_name: ubuntu22_cpython
       image_name: ubuntu-22.04
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: venv/bin/pytest -n 2 -vvs
 
   - template: etc/ci/azure-posix.yml
     parameters:
-      job_name: macos12_cpython
-      image_name: macOS-12
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      job_name: ubuntu24_cpython
+      image_name: ubuntu-24.04
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: venv/bin/pytest -n 2 -vvs
 
   - template: etc/ci/azure-posix.yml
     parameters:
       job_name: macos13_cpython
       image_name: macOS-13
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: venv/bin/pytest -n 2 -vvs
 
+  - template: etc/ci/azure-posix.yml
+    parameters:
+        job_name: macos14_cpython
+        image_name: macOS-14
+        python_versions: ['3.9', '3.10', '3.11', '3.12']
+        test_suites:
+            all: venv/bin/pytest -n 2 -vvs
+
   - template: etc/ci/azure-win.yml
     parameters:
       job_name: win2019_cpython
       image_name: windows-2019
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: venv\Scripts\pytest -n 2 -vvs
 
   - template: etc/ci/azure-win.yml
     parameters:
       job_name: win2022_cpython
       image_name: windows-2022
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: venv\Scripts\pytest -n 2 -vvs
 
@@ -63,12 +63,12 @@ jobs:
 
   - template: etc/ci/azure-posix.yml
     parameters:
-      job_name: ubuntu22_test_all_supported_click_versions
-      image_name: ubuntu-22.04
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      job_name: ubuntu24_test_all_supported_click_versions
+      image_name: ubuntu-24.04
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         click_versions: |
-          for clk_ver in 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
+          for clk_ver in 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
             do
               pip install click==$clk_ver;
               venv/bin/pytest -vvs tests/test_cliutils_progressbar.py;
@@ -80,9 +80,9 @@ jobs:
 
   - template: etc/ci/azure-posix.yml
     parameters:
-      job_name: ubuntu22_cpython_latest_from_pip
-      image_name: ubuntu-22.04
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      job_name: ubuntu24_cpython_latest_from_pip
+      image_name: ubuntu-24.04
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: |
           venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .
@@ -91,9 +91,9 @@ jobs:
 
   - template: etc/ci/azure-win.yml
     parameters:
-      job_name: win2019_cpython_latest_from_pip
-      image_name: windows-2019
-      python_versions: ["3.9", "3.10", "3.11", "3.12"]
+      job_name: win2022_cpython_latest_from_pip
+      image_name: windows-2022
+      python_versions: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       test_suites:
         all: |
           venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .

requirements.txt

@@ -1,5 +1,5 @@
 attrs==22.2.0
-beautifulsoup4==4.11.2
+beautifulsoup4==4.13.3
 certifi==2022.12.7
 chardet==5.2.0
 click==8.1.3

setup.cfg

@@ -41,7 +41,7 @@ python_requires = >=3.9
 
 install_requires =
     attrs >= 18.1, !=20.1.0
-    Beautifulsoup4[chardet] >= 4.0.0
+    Beautifulsoup4[chardet] >= 4.13.0
     click >= 6.7, !=7.0
     requests[use_chardet_on_py3] >= 2.7.0
     saneyaml >= 0.5.2

src/commoncode/text.py

@@ -143,4 +143,4 @@ def as_unicode(s):
     if not s:
         return s
     assert isinstance(s, bytes), "s must be bytes but is: {}".format(s)
-    return UnicodeDammit(s).markup
+    return UnicodeDammit(s).unicode_markup