v11.5.1 (#35)

ambient-innovation · Oct 14, 2024 · e7fca13 · e7fca13
1 parent 7d525a8
commit e7fca13
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,8 @@ name: Unit tests
 
 on:
   push:
-    branches: [ '**' ]
+    branches:
+    - master
   pull_request:
 
 jobs:
@@ -43,7 +44,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', ]
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', ]
         django-version: ['42', '50', '51', ]
 
         exclude:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.4
+    rev: v0.6.9
     hooks:
       # Run the Ruff linter.
       - id: ruff
@@ -12,23 +12,34 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.18.0
+    rev: 1.19.0
     hooks:
       - id: blacken-docs
         additional_dependencies:
         - black==24.4.2
         files: '(?:README\.md|docs\/.*\.(?:md|rst))'
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.18.0
     hooks:
       - id: pyupgrade
         args: [ --py39-plus ]
-        stages: [ push ]
+        stages: [ pre-push ]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.21.0
+    rev: 1.22.1
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
-        stages: [ push ]
+        stages: [ pre-push ]
+
+  - repo: https://github.com/adamchainz/djade-pre-commit
+    rev: 1.3.0
+    hooks:
+    -   id: djade
+        args: [--target-version, "4.2"]
+        exclude: |
+          (?x)^(
+            charts/.*
+            |.*\.py
+          )$
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,12 @@
 # Changelog
 
-**11.5.0** (2024-09-29)
+**11.5.1** (2024-10-08)
+* Added Python 3.13 support
+* Added Djade linter to pre-commit
+* Improved GitHub action triggers
+* Updated dev dependencies and linters
 
+**11.5.0** (2024-09-29)
 * Added system check to ensure that all model relation fields have a related name, either directly set or via the model
   meta-option "default_related_name".
 

diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ Example: run all hooks of pre-push stage
 
 ### Update documentation
 
-- To build the documentation run: `sphinx-build docs/ docs/_build/html/`.
+- To build the documentation, run: `sphinx-build docs/ docs/_build/html/`.
 - Open `docs/_build/html/index.html` to see the documentation.
 
 

diff --git a/ambient_toolbox/__init__.py b/ambient_toolbox/__init__.py
@@ -1,3 +1,3 @@
 """Python toolbox of Ambient Digital containing an abundance of useful tools and gadgets."""
 
-__version__ = "11.5.0"
+__version__ = "11.5.1"
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Utilities",
 ]
 dynamic = ["version", "description"]
@@ -38,19 +39,19 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-   'typer~=0.9',
-   'freezegun~=1.3',
-   'pytest-django~=4.7',
-   'pytest-mock~=3.12',
+   'typer~=0.12',
+   'freezegun~=1.5',
+   'pytest-django~=4.9',
+   'pytest-mock~=3.14',
    'coverage~=7.6',
-   'pre-commit~=3.7',
-   'ruff~=0.4',
+   'pre-commit~=4.0',
+   'ruff~=0.6',
    'sphinx~=7.1',
    'sphinx-rtd-theme~=2.0',
    'm2r2==0.3.3.post2',
    'mistune<2.0.0',
    'flit~=3.9',
-   'keyring~=25.2',
+   'keyring~=25.4',
    'ambient-package-update',
    'gevent~=23.9',
    'httpx~=0.27',
@@ -218,6 +219,7 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
 """
 
 [tool.pytest.ini_options]

diff --git a/scripts/unix/publish_to_pypi.sh b/scripts/unix/publish_to_pypi.sh
@@ -1,2 +1,2 @@
  flit publish --repository testpypi
- flit publish
+ flit publish
diff --git a/scripts/windows/publish_to_pypi.ps1 b/scripts/windows/publish_to_pypi.ps1
@@ -1,2 +1,2 @@
  flit publish --repository testpypi
- flit publish
+ flit publish
diff --git a/testapp/templates/403.html b/testapp/templates/403.html
@@ -50,10 +50,10 @@
 <body>
 {% block body %}
     <div class="container">
-        <h1>{% trans "Error 403" %}</h1>
+        <h1>{% translate "Error 403" %}</h1>
         <div class="image-container">
             <p class="error-msg">You don't have access to this page.</p>
         </div>
     </div>
-{% endblock %}
+{% endblock body %}
 </body>
diff --git a/testapp/templates/testapp/test_template.html b/testapp/templates/testapp/test_template.html
@@ -8,4 +8,3 @@
 </div>
 </body>
 </html>
-