Merge pull request #19 from openzim/python_3_13

Upgrade to Python 3.13 and other deps

Author: benoit74

.github/workflows/Tests.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -51,4 +51,4 @@ jobs:
       - name: Ensure we can build Python targets
         run: |
           pip install -U pip build
-          python3 -m build --sdist --wheel
+          python3 -m build --sdist --wheel

.pre-commit-config.yaml

@@ -2,20 +2,20 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
   -   id: trailing-whitespace
   -   id: end-of-file-fixer
 - repo: https://github.com/psf/black
-  rev: "24.4.2"
+  rev: "24.10.0"
   hooks:
   -   id: black
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.3
+  rev: v0.9.1
   hooks:
   - id: ruff
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.361
+  rev: v1.1.392.post0
   hooks:
   - id: pyright
     name: pyright (system)

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Add support for 3.13, remove support for 3.8
+
 ## [0.2.1] - 2024-05-06
 
 ### Fixed

pyproject.toml

@@ -1,43 +1,56 @@
 [build-system]
-requires = ["hatchling", "hatch-openzim"]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
 name = "hatch-openzim"
-requires-python = ">=3.8,<3.13"
+requires-python = ">=3.9,<3.14"
 description = "openZIM hatch plugin to set metadata automatically and download files at build time"
 readme = "README.md"
 dependencies = [
-  "hatchling==1.21.1",
-  "packaging==23.2",
+  "hatchling==1.27.0",
+  "packaging==24.2",
   "toml==0.10.2", # to be removed once only 3.11 and above is supported
 ]
-dynamic = ["authors", "keywords", "license", "version", "urls", "classifiers"]
-
-[tool.hatch.metadata.hooks.openzim-metadata]
-additional-keywords = ["hatch","plugin","download","file"]
-additional-classifiers = [
-  "Framework :: Hatch",
+authors = [
+  { "name" = "openZIM", "email" = "[email protected]"},
+]
+keywords = ["hatch","plugin","download","file"]
+license = {text = "GPL-3.0-or-later"}
+classifiers = [
+    "Framework :: Hatch",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 ]
+dynamic = ["version"]
+
+[project.urls]
+Donate = "https://www.kiwix.org/en/support-us/"
+Homepage = "https://github.com/openzim/hatch-openzim"
 
 [project.optional-dependencies]
 scripts = [
   "invoke==2.2.0",
 ]
 lint = [
-  "black==24.4.2",
-  "ruff==0.4.3",
+  "black==24.10.0",
+  "ruff==0.9.2",
 ]
 check = [
-  "pyright==1.1.361",
+  "pyright==1.1.392.post0",
 ]
 test = [
-  "pytest==8.2.0",
-  "coverage==7.5.1",
+  "pytest==8.3.4",
+  "coverage==7.6.10",
 ]
 dev = [
-  "pre-commit==3.7.0",
-  "debugpy==1.8.1",
+  "pre-commit==4.0.1",
+  "debugpy==1.8.11",
   "hatch-openzim[scripts]",
   "hatch-openzim[lint]",
   "hatch-openzim[test]",

src/hatch_openzim/files_install.py

@@ -110,9 +110,9 @@ def _process_execute_after(base_target_dir: Path, actions: List[str]):
 
     for action in actions:
         logger.info(f"  Executing '{action}'")
-        process = subprocess.run(  # noqa: PLW1510
+        process = subprocess.run(  # noqa: PLW1510,S602
             action,
-            shell=True,  # noqa: S602 # nosec: B602
+            shell=True,  # nosec: B602
             cwd=base_target_dir,
             text=True,
             stderr=subprocess.STDOUT,

src/hatch_openzim/shared.py

@@ -11,6 +11,5 @@
 # setup console logging
 console_handler = logging.StreamHandler(sys.stdout)
 console_handler.setFormatter(logging.Formatter(DEFAULT_FORMAT))
-log_level = logging.getLevelName(os.getenv("HATCH_OPENZIM_LOG_LEVEL", "INFO"))
-console_handler.setLevel(log_level)
+console_handler.setLevel(os.getenv("HATCH_OPENZIM_LOG_LEVEL", "INFO"))
 logger.addHandler(console_handler)