Modernise to Py310

Author: mcarans

.pre-commit-config.yaml

@@ -2,24 +2,25 @@ default_language_version:
     python: python3.13
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
+    rev: v0.14.10
     hooks:
       # Run the linter.
       - id: ruff-check
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.14
+    rev: 0.9.22
     hooks:
       # Run the pip compile
       - id: pip-compile
         name: pip-compile requirements.txt
         files: pyproject.toml
-        args: [ pyproject.toml, --resolver=backtracking, --all-extras, --upgrade, -q, -o, requirements.txt ]
+        args: [ pyproject.toml, --resolver=backtracking, --upgrade, -q,
+                -o, requirements.txt ]

pyproject.toml

@@ -31,7 +31,7 @@ classifiers = [
     "Operating System :: MacOS",
     "Operating System :: Microsoft :: Windows",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 
 dependencies = [
     "ckanapi>=4.8",

requirements.txt

@@ -1,43 +1,25 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
+#    uv pip compile pyproject.toml --resolver=backtracking -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-astdoc==1.3.2
-    # via mkapi
 attrs==25.4.0
     # via
     #   frictionless
     #   jsonlines
     #   jsonschema
     #   referencing
-babel==2.17.0
-    # via mkdocs-material
-backrefs==6.1
-    # via mkdocs-material
-cachetools==6.2.4
-    # via google-auth
 certifi==2026.1.4
     # via requests
-cfgv==3.5.0
-    # via pre-commit
 chardet==5.2.0
     # via frictionless
 charset-normalizer==3.4.4
     # via requests
 ckanapi==4.9
     # via hdx-python-api (pyproject.toml)
 click==8.3.1
-    # via
-    #   mkdocs
-    #   typer
-colorama==0.4.6
-    # via mkdocs-material
-coverage==7.13.1
-    # via pytest-cov
+    # via typer
 defopt==7.0.0
     # via hdx-python-api (pyproject.toml)
-distlib==0.4.0
-    # via virtualenv
 dnspython==2.8.0
     # via email-validator
 docopt==0.6.2
@@ -50,20 +32,8 @@ email-validator==2.3.0
     # via hdx-python-api (pyproject.toml)
 et-xmlfile==2.0.0
     # via openpyxl
-filelock==3.20.2
-    # via virtualenv
 frictionless==5.18.1
     # via hdx-python-utilities
-ghp-import==2.1.0
-    # via mkdocs
-google-auth==2.46.0
-    # via
-    #   google-auth-oauthlib
-    #   gspread
-google-auth-oauthlib==1.2.2
-    # via gspread
-gspread==6.2.1
-    # via hdx-python-api (pyproject.toml)
 hdx-python-country==3.9.8
     # via hdx-python-api (pyproject.toml)
 hdx-python-utilities==3.9.9
@@ -72,8 +42,6 @@ hdx-python-utilities==3.9.9
     #   hdx-python-country
 humanize==4.15.0
     # via frictionless
-identify==2.6.15
-    # via pre-commit
 idna==3.11
     # via
     #   email-validator
@@ -82,21 +50,15 @@ ijson==3.4.0.post0
     # via hdx-python-utilities
 inflect==7.5.0
     # via quantulum3
-iniconfig==2.3.0
-    # via pytest
 isodate==0.7.2
     # via frictionless
 jinja2==3.1.6
-    # via
-    #   frictionless
-    #   mkapi
-    #   mkdocs
-    #   mkdocs-material
+    # via frictionless
 jsonlines==4.0.0
     # via hdx-python-utilities
 jsonpath-ng==1.7.0
     # via libhxl
-jsonschema==4.25.1
+jsonschema==4.26.0
     # via
     #   frictionless
     #   tableschema-to-template
@@ -110,105 +72,39 @@ loguru==0.7.3
     # via hdx-python-utilities
 makefun==1.16.0
     # via hdx-python-api (pyproject.toml)
-markdown==3.10
-    # via
-    #   mkdocs
-    #   mkdocs-material
-    #   pymdown-extensions
 markdown-it-py==4.0.0
     # via rich
 marko==2.2.2
     # via frictionless
 markupsafe==3.0.3
-    # via
-    #   jinja2
-    #   mkdocs
+    # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-mergedeep==1.3.4
-    # via
-    #   mkdocs
-    #   mkdocs-get-deps
-mkapi==4.5.0
-    # via hdx-python-api (pyproject.toml)
-mkdocs==1.6.1
-    # via
-    #   mkapi
-    #   mkdocs-material
-mkdocs-get-deps==0.2.0
-    # via mkdocs
-mkdocs-material==9.7.1
-    # via mkapi
-mkdocs-material-extensions==1.3.1
-    # via mkdocs-material
 more-itertools==10.8.0
     # via inflect
-nodeenv==1.10.0
-    # via pre-commit
 num2words==0.5.14
     # via quantulum3
-oauthlib==3.3.1
-    # via requests-oauthlib
 openpyxl==3.1.5
     # via hdx-python-utilities
-packaging==25.0
-    # via
-    #   mkdocs
-    #   pytest
-paginate==0.5.7
-    # via mkdocs-material
-pathspec==0.12.1
-    # via mkdocs
 petl==1.7.17
     # via frictionless
-platformdirs==4.5.1
-    # via
-    #   mkdocs-get-deps
-    #   virtualenv
-pluggy==1.6.0
-    # via
-    #   pytest
-    #   pytest-cov
 ply==3.11
     # via
     #   jsonpath-ng
     #   libhxl
 pockets==0.9.1
     # via sphinxcontrib-napoleon
-pre-commit==4.5.1
-    # via hdx-python-api (pyproject.toml)
-pyasn1==0.6.1
-    # via
-    #   pyasn1-modules
-    #   rsa
-pyasn1-modules==0.4.2
-    # via google-auth
 pydantic==2.12.5
     # via frictionless
 pydantic-core==2.41.5
     # via pydantic
 pygments==2.19.2
-    # via
-    #   mkdocs-material
-    #   pytest
-    #   rich
-pymdown-extensions==10.20
-    # via mkdocs-material
+    # via rich
 pyphonetics==0.5.3
     # via hdx-python-utilities
-pytest==9.0.2
-    # via
-    #   hdx-python-api (pyproject.toml)
-    #   pytest-check
-    #   pytest-cov
-pytest-check==2.6.2
-    # via hdx-python-api (pyproject.toml)
-pytest-cov==7.0.0
-    # via hdx-python-api (pyproject.toml)
 python-dateutil==2.9.0.post0
     # via
     #   frictionless
-    #   ghp-import
     #   hdx-python-utilities
     #   libhxl
 python-io-wrapper==0.3.1
@@ -220,14 +116,7 @@ python-slugify==8.0.4
 pyyaml==6.0.3
     # via
     #   frictionless
-    #   mkdocs
-    #   mkdocs-get-deps
-    #   pre-commit
-    #   pymdown-extensions
-    #   pyyaml-env-tag
     #   tableschema-to-template
-pyyaml-env-tag==1.1
-    # via mkdocs
 quantulum3==0.9.2
     # via hdx-python-api (pyproject.toml)
 ratelimit==2.2.1
@@ -242,13 +131,9 @@ requests==2.32.5
     #   ckanapi
     #   frictionless
     #   libhxl
-    #   mkdocs-material
     #   requests-file
-    #   requests-oauthlib
 requests-file==3.0.1
     # via hdx-python-utilities
-requests-oauthlib==2.0.0
-    # via google-auth-oauthlib
 rfc3986==2.0.0
     # via frictionless
 rich==14.2.0
@@ -257,8 +142,6 @@ rpds-py==0.30.0
     # via
     #   jsonschema
     #   referencing
-rsa==4.9.1
-    # via google-auth
 ruamel-yaml==0.19.1
     # via hdx-python-utilities
 setuptools==80.9.0
@@ -289,7 +172,7 @@ text-unidecode==1.3
     # via python-slugify
 typeguard==4.4.4
     # via inflect
-typer==0.21.0
+typer==0.21.1
     # via frictionless
 typing-extensions==4.15.0
     # via
@@ -305,16 +188,12 @@ unidecode==1.4.0
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.6.2
+urllib3==2.6.3
     # via
     #   libhxl
     #   requests
 validators==0.35.0
     # via frictionless
-virtualenv==20.35.4
-    # via pre-commit
-watchdog==6.0.0
-    # via mkdocs
 wheel==0.45.1
     # via libhxl
 xlrd==2.0.2

ruff.toml

@@ -1,15 +1,10 @@
+target-version = "py310"
+src = ["src"]
 exclude = ["_version.py"]
 
 [lint]
 # List of rules: https://docs.astral.sh/ruff/rules/
-select = [
-  "E",   # pycodestyle - default
-  "F",   # pyflakes - default
-  "I"    # isort
+extend-select = [
+  "I",   # isort
+  "UP"   # Upgrade Python
 ]
-ignore = [
-    "E501" # Line too long
-]
-
-[lint.isort]
-known-local-folder = ["hdx"]