Python 3.10 compatibility (#2)

Author: elprans

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.10"
       - uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1  # v3.5.1
         with:
           version: "0.12.11"

README.rst

@@ -481,7 +481,7 @@ Run with custom options:
 Requirements
 ============
 
-- Python 3.11+
+- Python 3.10+
 - click >= 8.1.0
 - coverage >= 7.4
 - typing-extensions >= 4.14.0

pyproject.toml

@@ -6,7 +6,7 @@ authors = [
     { name = "Gel Contributors" },
 ]
 version = "1.0.0"
-requires-python = ">=3.11.0"
+requires-python = ">=3.10.0"
 readme = "README.rst"
 license = { text = "Apache License, Version 2.0" }
 keywords = ["gel", "edgedb", "database", "test"]
@@ -64,7 +64,7 @@ exclude = [
     "^target",
 ]
 files = ["src/**/*.py"]
-python_version = "3.11"
+python_version = "3.10"
 follow_imports = "normal"
 strict = true
 ignore_errors = false
@@ -77,15 +77,15 @@ local_partial_types = true
 
 [tool.pyright]
 include = ["src/**"]
-pythonVersion = "3.11"
+pythonVersion = "3.10"
 typeCheckingMode = "standard"
 
 # ========================
 #          BLACK
 # ========================
 [tool.black]
 line-length = 79
-target-version = ["py311"]
+target-version = ["py310"]
 
 # ========================
 #           RUFF
@@ -94,7 +94,7 @@ target-version = ["py311"]
 [tool.ruff]
 line-length = 79
 indent-width = 4
-target-version = "py311"
+target-version = "py310"
 exclude = [".github", ".git", "build", "dist", ".eggs"]
 
 [tool.ruff.lint]
@@ -156,4 +156,5 @@ extend-ignore = [
     "SIM117",  # multiple-with-statements
     "UP045",   # non-pep604-annotation-optional
     "PLR5501", # collapsible-else-if
+    "PERF203"  # try-except-in-loop
 ]

src/geltest/_internal/fixtures.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Protocol
-from typing_extensions import TypeAliasType, TypedDict
-from typing import Required
+from typing_extensions import TypeAliasType, TypedDict, Required
 
 import asyncio
 import functools
@@ -227,27 +226,29 @@ async def _call_session_phase(
         for case in eligible:
             await callback(test_case=case, stats=stats, options=options, ui=ui)
     else:
-        async with asyncio.TaskGroup() as g:
-            # Use a semaphore to limit the concurrency of bootstrap
-            # tasks to the number of jobs (bootstrap is heavy, having
-            # more tasks than `--jobs` won't necessarily make
-            # things faster.)
-            sem = asyncio.BoundedSemaphore(num_jobs)
-
-            async def controller(
-                cb: _PhaseCallback,
-                test_case: type[loader.DatabaseTestCaseProto],
-            ) -> None:
-                async with sem:
-                    await cb(
-                        test_case=test_case,
-                        stats=stats,
-                        options=options,
-                        ui=ui,
-                    )
-
-            for case in eligible:
-                g.create_task(controller(callback, case))
+        # Use a semaphore to limit the concurrency of bootstrap
+        # tasks to the number of jobs (bootstrap is heavy, having
+        # more tasks than `--jobs` won't necessarily make
+        # things faster.)
+        sem = asyncio.BoundedSemaphore(num_jobs)
+
+        async def controller(
+            test_case: type[loader.DatabaseTestCaseProto],
+        ) -> None:
+            async with sem:
+                await callback(
+                    test_case=test_case,
+                    stats=stats,
+                    options=options,
+                    ui=ui,
+                )
+
+        if sys.version_info >= (3, 11):
+            async with asyncio.TaskGroup() as g:
+                for case in eligible:
+                    g.create_task(controller(case))
+        else:
+            await asyncio.gather(controller(case) for case in eligible)
 
     ui.text("\n")
 

src/geltest/_internal/results.py

@@ -299,7 +299,7 @@ def render_result(file: TextIO, result: TestResult) -> None:
 
 
 def _result_log_path(path_template: str) -> pathlib.Path | None:
-    now = str(datetime.datetime.now(datetime.UTC)).replace(" ", "_")
+    now = str(datetime.datetime.now(datetime.timezone.utc)).replace(" ", "_")
     path = pathlib.Path(path_template.replace("%TIMESTAMP%", now))
 
     parent_dir = path.parent

src/geltest/_internal/runner.py

@@ -1321,7 +1321,7 @@ def run(
                     result.test_stats + setup_stats + teardown_stats
                 ):
                     name = str(test_obj)
-                    t = stat["running-time"]
+                    t = stat.get("running-time", 0)
                     at, c = stats.get(name, (0, 0))
                     stats[name] = (at + (t - at) / (c + 1), c + 1)
                 running_times_log_file.seek(0)