Merge pull request #3090 from locustio/drop-support-for-python-3.9

Drop support for Python 3.9

Author: cyberw

Diff for: .github/workflows/tests.yml

@@ -144,7 +144,6 @@ jobs:
           - { name: "Python 3.12", python: "3.12", os: ubuntu-latest, env: "test:all" }
           - { name: "Python 3.11", python: "3.11", os: ubuntu-latest, env: "test:all" }
           - { name: "Python 3.10", python: "3.10", os: ubuntu-latest, env: "test:all" }
-          - { name: "Python 3.9", python: "3.9", os: ubuntu-latest, env: "test:all" }
 
     steps:
       - uses: actions/checkout@v4

Diff for: examples/grpc/grpc_user.py

@@ -2,7 +2,8 @@
 from locust.exception import LocustError
 
 import time
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import grpc
 import grpc.experimental.gevent as grpc_gevent

Diff for: locust/clients.py

@@ -373,12 +373,10 @@ def __exit__(self, exc, value, traceback):  # type: ignore[override]
                 while (
                     isinstance(
                         e,
-                        (
-                            requests.exceptions.ConnectionError,
-                            requests.packages.urllib3.exceptions.ProtocolError,
-                            requests.packages.urllib3.exceptions.MaxRetryError,
-                            requests.packages.urllib3.exceptions.NewConnectionError,
-                        ),
+                        requests.exceptions.ConnectionError
+                        | requests.packages.urllib3.exceptions.ProtocolError
+                        | requests.packages.urllib3.exceptions.MaxRetryError
+                        | requests.packages.urllib3.exceptions.NewConnectionError,
                     )
                     and e.__context__  # Not sure if the above exceptions can ever be the lowest level, but it is good to be sure
                 ):

Diff for: locust/env.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from operator import methodcaller
-from typing import Callable, TypeVar
+from typing import TypeVar
 
 from configargparse import Namespace
 

Diff for: locust/input_events.py

@@ -4,7 +4,7 @@
 import logging
 import os
 import sys
-from typing import Callable
+from collections.abc import Callable
 
 import gevent
 

Diff for: locust/main.py

@@ -287,9 +287,6 @@ def kill_workers(children):
 
     greenlet_exception_handler = greenlet_exception_logger(logger)
 
-    if sys.version_info < (3, 10):
-        logger.warning("Python 3.9 support is deprecated and will be removed soon")
-
     if options.list_commands:
         print("Available Users:")
         for name in user_classes:

Diff for: locust/runners.py

@@ -14,10 +14,10 @@
 import traceback
 from abc import abstractmethod
 from collections import defaultdict
-from collections.abc import Iterator, MutableMapping, ValuesView
+from collections.abc import Callable, Iterator, MutableMapping, ValuesView
 from operator import itemgetter, methodcaller
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, TypedDict, cast
+from typing import TYPE_CHECKING, Any, NoReturn, TypedDict, cast
 from uuid import uuid4
 
 import gevent

Diff for: locust/stats.py

@@ -9,12 +9,12 @@
 import time
 from abc import abstractmethod
 from collections import OrderedDict, defaultdict, namedtuple
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from copy import copy
 from html import escape
 from itertools import chain
 from types import FrameType
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, Protocol, TypedDict, TypeVar, cast
+from typing import TYPE_CHECKING, Any, NoReturn, Protocol, TypedDict, TypeVar, cast
 
 import gevent
 

Diff for: locust/user/task.py

@@ -6,10 +6,10 @@
 import random
 import traceback
 from collections import deque
+from collections.abc import Callable
 from time import time
 from typing import (
     TYPE_CHECKING,
-    Callable,
     Protocol,
     TypeVar,
     final,

Diff for: locust/user/users.py

@@ -16,7 +16,8 @@
 import logging
 import time
 import traceback
-from typing import Callable, final
+from collections.abc import Callable
+from typing import final
 
 from gevent import GreenletExit, greenlet
 from gevent.pool import Group

Diff for: pyproject.toml

@@ -8,7 +8,7 @@ description = "Developer-friendly load testing framework"
 license = { text = "MIT" }
 dynamic = ["version"]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [{ name = "Jonatan Heyman" }, { name = "Lars Holmberg" }]
 maintainers = [
     { name = "Lars Holmberg" },
@@ -23,7 +23,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -125,7 +124,7 @@ local_scheme = "no-local-version"
 [tool.hatch.build.targets.BuildFrontend.hooks.custom]
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 line-length = 120
 extend-exclude = [
     "build",
@@ -156,7 +155,7 @@ locust = ["locust"]
 [tool.mypy]
 # missing type stubs
 ignore_missing_imports = true
-python_version = "3.9"
+python_version = "3.10"
 
 [tool.pyright]
 exclude = ["locust/test"]
@@ -199,7 +198,7 @@ run = [
 template = "hatch-test"
 
 [[tool.hatch.envs.test.matrix]]
-python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+python = ["3.10", "3.11", "3.12", "3.13"]
 
 
 ## Run all unit tests and advanced debugging