Remove 3.8 and add 3.13 (#3020)

* Remove 3.8 and add 3.13

* Run on guide and tests also

* Update test runners

* squash

* Remove windows 3.12/13 tests

Author: ahopkins

.github/workflows/tests.yml

@@ -24,29 +24,26 @@ jobs:
       fail-fast: true
       matrix:
         config:
-          - { python-version: "3.8",  tox-env: security }
           - { python-version: "3.9",  tox-env: security }
           - { python-version: "3.10", tox-env: security }
           - { python-version: "3.11", tox-env: security }
           - { python-version: "3.10", tox-env: lint }
           # - { python-version: "3.10", tox-env: docs }
-          - { python-version: "3.8",  tox-env: type-checking }
           - { python-version: "3.9",  tox-env: type-checking }
           - { python-version: "3.10", tox-env: type-checking }
           - { python-version: "3.11", tox-env: type-checking }
-          - { python-version: "3.8",  tox-env: py38,          max-attempts: 3 }
-          - { python-version: "3.8",  tox-env: py38-no-ext,   max-attempts: 3 }
           - { python-version: "3.9",  tox-env: py39,          max-attempts: 3 }
           - { python-version: "3.9",  tox-env: py39-no-ext,   max-attempts: 3 }
           - { python-version: "3.10", tox-env: py310,         max-attempts: 3 }
           - { python-version: "3.10", tox-env: py310-no-ext,  max-attempts: 3 }
           - { python-version: "3.11", tox-env: py311,         max-attempts: 3 }
           - { python-version: "3.12", tox-env: py312,         max-attempts: 3 }
-          - { python-version: "3.11", tox-env: py311-no-ext,  max-attempts: 3 }
-          - { python-version: "3.8",  tox-env: py38-no-ext,   platform: windows-latest, ignore-errors: true }
+          - { python-version: "3.12", tox-env: py312-no-ext,  max-attempts: 3 }
+          - { python-version: "3.13", tox-env: py313,         max-attempts: 3 }
+          - { python-version: "3.13", tox-env: py313-no-ext,  max-attempts: 3 }
           - { python-version: "3.9",  tox-env: py39-no-ext,   platform: windows-latest, ignore-errors: true }
           - { python-version: "3.10", tox-env: py310-no-ext,  platform: windows-latest, ignore-errors: true }
-          - { python-version: "3.11", tox-env: py310-no-ext,  platform: windows-latest, ignore-errors: true }
+          - { python-version: "3.11", tox-env: py311-no-ext,  platform: windows-latest, ignore-errors: true }
     steps:
       - name: Run tests
         uses: sanic-org/simple-tox-action@v1

guide/webapp/display/layouts/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from html5tagger import Builder
 

guide/webapp/display/layouts/home.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from html5tagger import Builder, E
 

guide/webapp/display/layouts/main.py

@@ -1,5 +1,5 @@
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from sanic import Request
 from webapp.display.layouts.elements.footer import do_footer

guide/webapp/display/page/page.py

@@ -2,7 +2,6 @@
 
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Type
 
 from frontmatter import parse
 
@@ -16,7 +15,7 @@
 _PAGE_CACHE: dict[
     str, dict[str, tuple[Page | None, Page | None, Page | None]]
 ] = {}
-_LAYOUTS_CACHE: dict[str, Type[BaseLayout]] = {
+_LAYOUTS_CACHE: dict[str, type[BaseLayout]] = {
     "home": HomeLayout,
     "main": MainLayout,
 }
@@ -45,7 +44,7 @@ class Page:
 
     DEFAULT_LANGUAGE = _DEFAULT
 
-    def get_layout(self) -> Type[BaseLayout]:
+    def get_layout(self) -> type[BaseLayout]:
         return _LAYOUTS_CACHE[self.meta.layout]
 
     @property

guide/webapp/display/page/renderer.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import Type
 
 from html5tagger import HTML, Builder  # type: ignore
 
@@ -52,7 +51,7 @@ def _body(
 
     @contextmanager
     def _base(self, request: Request, builder: Builder, page: Page | None):
-        layout_type: Type[BaseLayout] = (
+        layout_type: type[BaseLayout] = (
             page.get_layout() if page else BaseLayout
         )
         layout = layout_type(builder)