Support Python 3.13

Author: ale-rt

.github/workflows/tests.yml

@@ -26,6 +26,9 @@ jobs:
         include:
           - python-version: "3.7"
             os: ubuntu-22.04
+        exclude:
+          - python-version: "3.7"
+            os: ubuntu-latest
     runs-on: "${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v2

HISTORY.md

@@ -2,8 +2,7 @@
 
 ## 3.1.1 (unreleased)
 
-
-- Declare support for Python 3.12
+- Declare support for Python 3.13
   [ale-rt]
 
 

requirements.d/requirements-dev.txt

@@ -1,54 +1,57 @@
-beautifulsoup4==4.12.2
-bleach==6.0.0
-build==0.10.0
-certifi==2024.7.4
-cffi==1.15.1
+beautifulsoup4==4.13.3
+build==1.2.2.post1
+certifi==2025.1.31
+cffi==1.17.1
 cfgv==3.4.0
-charset-normalizer==3.1.0
-check-manifest==0.49
+charset-normalizer==3.4.1
+check-manifest==0.50
+cmarkgfm==2024.11.20
 colorama==0.4.6
-coverage==7.3.3
-cryptography==44.0.1
-distlib==0.3.8
-docutils==0.19
-filelock==3.13.1
-identify==2.5.33
-idna==3.7
-importlib-metadata==6.6.0
-iniconfig==2.0.0
-jaraco.classes==3.2.3
-jeepney==0.8.0
-keyring==23.13.1
-lxml==4.9.3
-markdown-it-py==2.2.0
+coverage==7.8.0
+cryptography==44.0.2
+distlib==0.3.9
+docutils==0.21.2
+filelock==3.18.0
+id==1.5.0
+identify==2.6.9
+idna==3.10
+iniconfig==2.1.0
+jaraco.classes==3.4.0
+jaraco.context==6.0.1
+jaraco.functools==4.1.0
+jeepney==0.9.0
+keyring==25.6.0
+lxml==5.3.2
+markdown-it-py==3.0.0
 mdurl==0.1.2
-more-itertools==9.1.0
-nodeenv==1.8.0
-packaging==23.2
-pkginfo==1.9.6
-platformdirs==4.1.0
-pluggy==1.3.0
-pre-commit==3.5.0; python_version <= "3.8"
-pre-commit==3.6.0; python_version > "3.8"
-pycparser==2.21
-Pygments==2.15.1
-pyproject_hooks==1.0.0
+more-itertools==10.6.0
+nh3==0.2.21
+nodeenv==1.9.1
+packaging==24.2
+pip==24.2
+platformdirs==4.3.7
+pluggy==1.5.0
+pre_commit==4.2.0
+pycparser==2.22
+Pygments==2.19.1
+pyproject_hooks==1.2.0
 pyroma==4.2
-pytest==7.4.3
-pytest-cov==4.1.0
-PyYAML==6.0.1
-readme-renderer==37.3
-requests==2.32.2
+pytest==8.3.5
+pytest-cov==6.1.1
+PyYAML==6.0.2
+readme_renderer==44.0
+requests==2.32.3
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
-rich==13.3.5
+rich==14.0.0
 SecretStorage==3.3.3
-six==1.16.0
-soupsieve==2.5
-trove-classifiers==2023.5.2
-twine==4.0.2
-urllib3==1.26.19
-virtualenv==20.26.6
-webencodings==0.5.1
-zest.releaser==8.0.0
-zipp==3.19.1
+setuptools==78.1.0
+soupsieve==2.6
+trove-classifiers==2025.3.19.19
+twine==6.1.0
+typing_extensions==4.13.1
+urllib3==2.3.0
+virtualenv==20.30.0
+wheel==0.45.1
+zest.releaser==9.5.0
+-e git+ssh://git@github.com/collective/zpretty.git@71e0eec2a3b00b43413714917e93e3d9c5550a5f#egg=zpretty

zpretty/elements.py

@@ -265,8 +265,8 @@ def render_doctype(self):
         """Render a properly indented comment"""
         doctype = f"{self.prefix}{self.context.PREFIX}{self.text}{self.context.SUFFIX}"
         if isinstance(
-            self.context.nextSibling, NavigableString
-        ) and self.context.nextSibling.startswith("\n"):
+            self.context.next_sibling, NavigableString
+        ) and self.context.next_sibling.startswith("\n"):
             doctype = doctype.rstrip()
         return doctype
 

zpretty/tests/test_cli.py

@@ -1,4 +1,3 @@
-from pkg_resources import resource_filename
 from tempfile import TemporaryDirectory
 from unittest import TestCase
 from zpretty.prettifier import ZPrettifier
@@ -9,6 +8,18 @@
 import os
 
 
+try:
+    from importlib.resources import files
+
+    def resource_filename(package, resource):
+        """Get the resource filename for a package and resource."""
+        return str(files(package).joinpath(resource))
+
+except ImportError:  # Python < 3.9
+    # Python < 3.9
+    from pkg_resources import resource_filename
+
+
 class TestCli(TestCase):
     """Test the cli options"""
 

zpretty/tests/test_readme.py

@@ -1,12 +1,23 @@
 from pathlib import Path
-from pkg_resources import resource_filename
 from unittest import TestCase
 from zpretty.tests.mock import MockCLIRunner
 
 import argparse
 import sys
 
 
+try:
+    from importlib.resources import files
+
+    def resource_filename(package, resource):
+        """Get the resource filename for a package and resource."""
+        return str(files(package).joinpath(resource))
+
+except ImportError:  # Python < 3.9
+    # Python < 3.9
+    from pkg_resources import resource_filename
+
+
 class TestReadme(TestCase):
     """Test zpretty"""
 

zpretty/tests/test_xml.py

@@ -1,10 +1,21 @@
 from bs4 import BeautifulSoup
-from pkg_resources import resource_filename
 from unittest import TestCase
 from zpretty.xml import XMLElement
 from zpretty.xml import XMLPrettifier
 
 
+try:
+    from importlib.resources import files
+
+    def resource_filename(package, resource):
+        """Get the resource filename for a package and resource."""
+        return str(files(package).joinpath(resource))
+
+except ImportError:  # Python < 3.9
+    # Python < 3.9
+    from pkg_resources import resource_filename
+
+
 class TestZpretty(TestCase):
     """Test zpretty"""
 

zpretty/tests/test_zcml.py

@@ -1,11 +1,22 @@
 from bs4 import BeautifulSoup
-from pkg_resources import resource_filename
 from unittest import TestCase
 from zpretty.zcml import ZCMLAttributes
 from zpretty.zcml import ZCMLElement
 from zpretty.zcml import ZCMLPrettifier
 
 
+try:
+    from importlib.resources import files
+
+    def resource_filename(package, resource):
+        """Get the resource filename for a package and resource."""
+        return str(files(package).joinpath(resource))
+
+except ImportError:  # Python < 3.9
+    # Python < 3.9
+    from pkg_resources import resource_filename
+
+
 class TestZpretty(TestCase):
     """Test zpretty"""
 

zpretty/tests/test_zpretty.py

@@ -1,8 +1,19 @@
-from pkg_resources import resource_filename
 from unittest import TestCase
 from zpretty.prettifier import ZPrettifier
 
 
+try:
+    from importlib.resources import files
+
+    def resource_filename(package, resource):
+        """Get the resource filename for a package and resource."""
+        return str(files(package).joinpath(resource))
+
+except ImportError:  # Python < 3.9
+    # Python < 3.9
+    from pkg_resources import resource_filename
+
+
 class TestZpretty(TestCase):
     """Test zpretty"""