Merge pull request #199 from canonical/python-3.10-updates

v1.7.0: Updates for Python 3.10

CHANGES.txt

@@ -16,3 +16,4 @@ v1.6.2, 2018-08-24 -- Add base_canonical variable for use in custom templates
 v1.6.3, 2019-05-08 -- Update the copyright year in the footer
 v1.6.4, 2021-10-20 -- Update pyyaml and gitpython
 v1.6.5, 2021-10-20 -- GitPython 3.1.20 (works with more python versions)
+v1.7.0, 2023-01-30 -- Update code and dependencies to work with Python 3.10

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name="ubuntudesign.documentation-builder",
-    version="1.6.5",
+    version="1.7.0",
     author="Canonical webteam",
     author_email="[email protected]",
     url="https://github.com/ubuntudesign/documentation-builder",
@@ -30,14 +30,14 @@
     long_description=open("README.rst").read(),
     install_requires=[
         "GitPython==3.1.20",
-        "Jinja2==2.8",
-        "Markdown==2.6.6",
+        "Jinja2==3.1.2 ",
+        "markdown==2.6.11",
         "mdx-anchors-away==1.0.1",
         "mdx-foldouts==1.0.0",
         "python-frontmatter==0.2.1",
-        "pygments==2.2.0",
+        "pygments==2.4.0",
         "PyYAML==6.0",
-        "beautifulsoup4==4.5.1",
+        "beautifulsoup4==4.11.1",
         "markdown_urlize==0.2.0",
     ],
     setup_requires=["pytest-runner"],

ubuntudesign/documentation_builder/operations.py

@@ -1,7 +1,7 @@
 # Core modules
 import re
 import tempfile
-from collections import Mapping
+from collections.abc import Mapping
 from copy import deepcopy
 from glob import glob, iglob
 from os import makedirs, path