locust 2.46.7.dev19__tar.gz → 2.46.7.dev22__tar.gz

{locust-2.46.7.dev19 → locust-2.46.7.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.7.dev19
+Version: 2.46.7.dev22
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust
@@ -38,7 +38,7 @@ Requires-Dist: python-engineio>=4.12.2
 Requires-Dist: python-socketio[client]>=5.13.0
 Requires-Dist: pywin32; sys_platform == 'win32'
 Requires-Dist: pyzmq>=25.0.0
-Requires-Dist: requests>=2.32.2
+Requires-Dist: requests>=2.33.1
 Requires-Dist: typing-extensions>=4.6.0; python_version < '3.12'
 Requires-Dist: werkzeug>=2.0.0
 Provides-Extra: dns

{locust-2.46.7.dev19 → locust-2.46.7.dev22}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.7.dev19'
-__version_tuple__ = version_tuple = (2, 46, 7, 'dev19')
+__version__ = version = '2.46.7.dev22'
+__version_tuple__ = version_tuple = (2, 46, 7, 'dev22')
 
 __commit_id__ = commit_id = None

{locust-2.46.7.dev19 → locust-2.46.7.dev22}/locust/clients.py

@@ -11,7 +11,6 @@ from typing import TYPE_CHECKING, cast
 from urllib.parse import unquote, urlparse, urlunparse
 
 import requests
-from packaging.version import Version
 from requests import Response
 from requests.adapters import HTTPAdapter
 from requests.auth import HTTPBasicAuth
@@ -28,8 +27,6 @@ if sys.version_info >= (3, 12):
 else:
     from typing_extensions import override
 
-requests_version = Version(requests.__version__).release
-
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator, Iterable, Mapping, MutableMapping
     from typing import Any, TypedDict, Unpack
@@ -45,7 +42,7 @@ if TYPE_CHECKING:
         cookies: RequestsCookieJar | MutableMapping[str, str] | None
         files: Any  # simplified signature
         auth: Any  # simplified signature
-        timeout: float | tuple[float, float] | tuple[float, None] | None
+        timeout: float | tuple[float | None, float | None] | None
         allow_redirects: bool
         proxies: MutableMapping[str, str] | None
         hooks: Mapping[str, Iterable[Callable[[Response], Any]] | Callable[[Response], Any]] | None
@@ -61,9 +58,8 @@ if TYPE_CHECKING:
 
 absolute_http_url_regexp = re.compile(r"^https?://", re.IGNORECASE)
 
-if requests_version >= (2, 32, 5):
-    _preloaded_ssl_context = create_urllib3_context()
-    _preloaded_ssl_context.load_verify_locations(extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH))
+_preloaded_ssl_context = create_urllib3_context()
+_preloaded_ssl_context.load_verify_locations(extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH))
 
 
 class HttpSession(requests.Session):
@@ -488,14 +484,10 @@ class LocustHttpAdapter(HTTPAdapter):
         if self.poolmanager is None:
             super().init_poolmanager(*args, **kwargs)
 
-    # In python requests version 2.32.5 they reverted
-    # https://github.com/psf/requests/pull/6667
-    # Without this change the root CA certificates are loaded on every request
-    # We re-implement this change to increase the performance
+    # requests reverted https://github.com/psf/requests/pull/6667 in 2.32.5, so without
+    # re-implementing it here the root CA certificates are loaded on every request.
+    # We re-implement it to increase performance (see _preloaded_ssl_context above).
     def cert_verify(self, conn, url, verify, cert):
-        if requests_version < (2, 32, 5):
-            return super().cert_verify(conn, url, verify, cert)
-
         if url.lower().startswith("https") and verify:
             conn.cert_reqs = "CERT_REQUIRED"
 
@@ -529,7 +521,7 @@ class LocustHttpAdapter(HTTPAdapter):
     def build_connection_pool_key_attributes(self, request, verify, cert=None):
         host_params, pool_kwargs = super().build_connection_pool_key_attributes(request, verify, cert)
 
-        if requests_version >= (2, 32, 5) and verify is True:
+        if verify is True:
             pool_kwargs["ssl_context"] = _preloaded_ssl_context
 
         return host_params, pool_kwargs

{locust-2.46.7.dev19 → locust-2.46.7.dev22}/locust/contrib/fasthttp.py

@@ -12,6 +12,7 @@ import socket
 import time
 import zlib
 from base64 import b64encode
+from contextlib import contextmanager
 from http.cookiejar import CookieJar
 from ssl import SSLError
 from typing import TYPE_CHECKING
@@ -111,6 +112,11 @@ class FastHttpSession:
         self.request_event = request_event
         self.cookiejar = CookieJar()
         self.user = user
+
+        # Requests can be grouped under a common name by setting request_name, or by using the rename_request context manager
+        # This is an alternative to passing in the "name" parameter to the requests function
+        self.request_name: str | None = None
+
         if not ssl_context_factory:
             if insecure:
                 ssl_context_factory = insecure_ssl_context_factory
@@ -153,6 +159,16 @@ class FastHttpSession:
         else:
             return f"{self.base_url}{path}"
 
+    @contextmanager
+    def rename_request(self, name: str) -> Generator[None]:
+        """Group requests using the "with" keyword"""
+
+        self.request_name = name
+        try:
+            yield
+        finally:
+            self.request_name = None
+
     def _send_request_safe_mode(self, method: str, url: str, **kwargs) -> FastResponse:
         """
         Send an HTTP request, and catch any exception that might occur due to either
@@ -221,6 +237,10 @@ class FastHttpSession:
         :return: A :py:class:`FastResponse <locust.contrib.fasthttp.FastResponse>` object if catch_response is False, and
             :py:class:`ResponseContextManager <locust.contrib.fasthttp.ResponseContextManager>` if True.
         """
+        # if group name has been set and no name parameter has been passed in; set the name parameter to group_name
+        if self.request_name and not name:
+            name = self.request_name
+
         # prepend url with hostname unless it's already an absolute URL
         built_url = self._build_url(url)
 

{locust-2.46.7.dev19 → locust-2.46.7.dev22}/pyproject.toml

@@ -35,7 +35,7 @@ classifiers = [
 dependencies = [
     "flask>=2.0.0",
     "Werkzeug>=2.0.0",
-    "requests>=2.32.2",
+    "requests>=2.33.1",
     "msgpack>=1.0.0",
     "pyzmq>=25.0.0",
     "geventhttpclient>=2.3.1",
@@ -83,7 +83,7 @@ lint = [
     "pre-commit>=4.5.0,<5.0.0",
     "ruff==0.16.8",
     "mypy>=1.13.0,<1.15.0",
-    "types-requests==2.32.4.20250809",
+    "types-requests==2.33.0.20260906",
     "typos>=1.50.1"
 ]
 release = ["twine>=5.1.1,<6.0.0"]