feat: py312

Author: klen

.git-commits.yaml

@@ -0,0 +1,36 @@
+---
+
+convention:
+  commitTypes:
+  - feat
+  - fix
+  - perf
+  - refactor
+  - style
+  - test
+  - build
+  - ops
+  - docs
+  - merge
+  commitScopes: []
+  releaseTagGlobPattern: v[0-9]*.[0-9]*.[0-9]*
+
+changelog:
+  commitTypes:
+  - feat
+  - fix
+  - perf
+  - merge
+  includeInvalidCommits: true
+  commitScopes: []
+  commitIgnoreRegexPattern: "^WIP "
+  headlines:
+    feat: Features
+    fix: Bug Fixes
+    perf: Performance Improvements
+    merge: Merges
+    breakingChange: BREAKING CHANGES
+  commitUrl: https://github.com/klen/asgi-babel/commit/%commit%
+  commitRangeUrl: https://github.com/klen/asgi-babel/compare/%from%...%to%?diff=split
+  issueRegexPattern: "#[0-9]+"
+  issueUrl: https://github.com/klen/asgi-babel/issues/%issue%

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
 
     - uses: actions/setup-python@main
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Build package
       run: |

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
     - name: Checkout changes
@@ -33,7 +33,7 @@ jobs:
       run: python -m pip install .[tests]
 
     - name: Check code
-      run: ruff asgi_babel
+      run: ruff check asgi_babel
 
     - name: Test with pytest
       run: pytest --mypy tests

.pre-commit-config.yaml

@@ -1,35 +1,73 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+
+fail_fast: true
+default_install_hook_types: [commit-msg, pre-commit, pre-push]
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
-
-- repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.253
+
+- repo: https://github.com/qoomon/git-conventional-commits
+  rev: 'v2.6.7'
   hooks:
-  - id: ruff
-    name: Check code
-    args: [--fix, --exit-non-zero-on-fix]
+  - id: conventional-commits
+    args: ["-c", ".git-commits.yaml"]
+    stages: ["commit-msg"]
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.6.0
+  hooks:
+  - id: check-case-conflict
+    stages: ["pre-commit"]
+  - id: check-merge-conflict
+    stages: ["pre-commit"]
+  - id: check-added-large-files
+    stages: ["pre-commit"]
+    args: ['--maxkb=5000']
+  - id: check-ast
+    stages: ["pre-commit"]
+  - id: check-executables-have-shebangs
+    stages: ["pre-commit"]
+  - id: check-symlinks
+    stages: ["pre-commit"]
+  - id: check-toml
+    stages: ["pre-commit"]
+  - id: check-yaml
+    stages: ["pre-commit"]
+  - id: debug-statements
+    stages: ["pre-commit"]
+  - id: end-of-file-fixer
+    stages: ["pre-commit"]
+  - id: trailing-whitespace
+    stages: ["pre-commit"]
+
+- repo: https://github.com/psf/black
+  rev: 24.4.2
+  hooks:
+  - id: black
+    stages: ["pre-commit"]
 
 - repo: local
   hooks:
-    - id: check-types
-      name: Check types
-      entry: mypy
-      language: system
-      pass_filenames: false
-    - id: check-code
-      name: Refactor code
-      entry: refurb asgi_babel
-      language: system
-      pass_filenames: false
-    - id: run-tests
-      name: Run tests
-      entry: pytest tests
-      language: system
-      pass_filenames: false
+  - id: ruff
+    name: ruff
+    entry: ruff check asgi_babel
+    language: system
+    pass_filenames: false
+    files: \.py$
+    stages: ["pre-commit"]
+
+  - id: mypy
+    name: mypy
+    entry: mypy
+    language: system
+    pass_filenames: false
+    files: \.py$
+    stages: ["pre-push"]
+
+  - id: pytest
+    name: pytest
+    entry: pytest
+    language: system
+    pass_filenames: false
+    files: \.py$
+    stages: ["pre-push"]

Makefile

@@ -2,10 +2,10 @@ VIRTUAL_ENV 	?= env
 
 all: $(VIRTUAL_ENV)
 
-$(VIRTUAL_ENV): pyproject.toml
+$(VIRTUAL_ENV): pyproject.toml .pre-commit-config.yaml
 	@[ -d $(VIRTUAL_ENV) ] || python -m venv $(VIRTUAL_ENV)
 	@$(VIRTUAL_ENV)/bin/pip install -e .[tests,dev,example]
-	@$(VIRTUAL_ENV)/bin/pre-commit install --hook-type pre-push
+	@$(VIRTUAL_ENV)/bin/pre-commit install
 	@touch $(VIRTUAL_ENV)
 
 VERSION	?= minor

README.rst

@@ -28,7 +28,7 @@ ASGI-Babel
 Requirements
 =============
 
-- python >= 3.8
+- python >= 3.9
 
 .. _installation:
 

asgi_babel/__init__.py

@@ -1,10 +1,11 @@
 """Support cookie-encrypted sessions for ASGI applications."""
+
 from __future__ import annotations
 
 import re
 from contextvars import ContextVar
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Awaitable, Callable, Dict, List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Awaitable, Callable, Optional, Union
 
 from asgi_tools import Request
 from asgi_tools.middleware import BaseMiddeware
@@ -28,6 +29,7 @@
 current_locale = ContextVar[Optional[Locale]]("locale", default=None)
 BABEL = None
 
+
 class BabelMiddlewareError(RuntimeError):
     """Base class for BabelMiddleware errors."""
 
@@ -50,21 +52,27 @@ class BabelMiddleware(BaseMiddeware):
     app: TASGIApp
     default_locale: str = "en"
     domain: str = "messages"
-    locales_dirs: List[str] = field(default_factory=lambda: ["locales"])
+    locales_dirs: list[str] = field(default_factory=lambda: ["locales"])
     locale_selector: Callable[[Request], Awaitable[Optional[str]]] = field(
-        repr=False, default=select_locale_by_request,
+        repr=False,
+        default=select_locale_by_request,
     )
 
-    translations: Dict[Tuple[str, str], support.Translations] = field(
-        init=False, repr=False, default_factory=lambda: {},
+    translations: dict[tuple[str, str], support.Translations] = field(
+        init=False,
+        repr=False,
+        default_factory=dict,
     )
 
     def __post_init__(self):
-        global BABEL # noqa:
+        global BABEL  # noqa:PLW0603
         BABEL = self
 
     async def __process__(
-        self, scope: TASGIScope, receive: TASGIReceive, send: TASGISend,
+        self,
+        scope: TASGIScope,
+        receive: TASGIReceive,
+        send: TASGISend,
     ):
         """Load/save the sessions."""
         if isinstance(scope, Request):
@@ -80,7 +88,8 @@ async def __process__(
 
 
 def get_translations(
-    domain: Optional[str] = None, locale: Optional[Locale] = None,
+    domain: Optional[str] = None,
+    locale: Optional[Locale] = None,
 ) -> Union[support.Translations, support.NullTranslations]:
     """Load and cache translations."""
     if BABEL is None:
@@ -112,7 +121,11 @@ def gettext(string: str, domain: Optional[str] = None, **variables):
 
 
 def ngettext(
-    singular: str, plural: str, num: int, domain: Optional[str] = None, **variables,
+    singular: str,
+    plural: str,
+    num: int,
+    domain: Optional[str] = None,
+    **variables,
 ):
     """Translate a string wity the current locale.
 
@@ -145,7 +158,7 @@ def npgettext(
     return t.unpgettext(context, singular, plural, num) % variables
 
 
-def parse_accept_header(header: str) -> List[Tuple[float, str]]:
+def parse_accept_header(header: str) -> list[tuple[float, str]]:
     """Parse accept headers."""
     result = []
     for match in accept_re.finditer(header):

pyproject.toml

@@ -3,8 +3,8 @@ name = "asgi-babel"
 version = "0.9.3"
 description = "Internationalization (i18n) support for ASGI applications"
 readme = "README.rst"
-requires-python = ">=3.8"
-license = {"text" = "MIT License"}
+requires-python = ">=3.9"
+license = { "text" = "MIT License" }
 authors = [{ name = "Kirill Klenov", email = "horneds@gmail.com" }]
 keywords = ["locale", "i18n", "l10n", "babel", "gettext", "translation", "asyncio", "trio", "asgi"]
 classifiers = [
@@ -14,18 +14,15 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Internet :: WWW/HTTP",
   "Framework :: AsyncIO",
   "Framework :: Trio",
 ]
-dependencies = [
-  "asgi-tools >= 0.73.0",
-  "babel",
-]
+dependencies = ["asgi-tools >= 0.73.0", "babel"]
 
 [project.urls]
 homepage = "https://github.com/klen/asgi-babel"
@@ -39,9 +36,7 @@ tests = [
   "ruff",
 ]
 example = ["uvicorn"]
-dev = [
-  "bump2version", "refurb; python_version >= '3.9'",
-  "tox", "pre-commit"]
+dev = ["bump2version", "refurb; python_version >= '3.9'", "tox", "pre-commit"]
 
 [tool.setuptools]
 packages = ['asgi_babel']
@@ -59,7 +54,7 @@ ignore_missing_imports = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py38,py39,py310,py311,pypy39
+envlist = py39,py310,py311,py312,pypy39
 
 [testenv]
 deps = -e .[tests]
@@ -76,10 +71,12 @@ commands =
 [tool.ruff]
 fix = true
 line-length = 100
-target-version = "py38"
+target-version = "py39"
 exclude = [".venv", "docs", "examples"]
+
+[tool.ruff.lint]
 select = ["ALL"]
 ignore = ["D", "UP", "ANN", "DJ", "EM", "RSE", "SLF", "S101", "PLR2004"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 required-imports = ["from __future__ import annotations"]