locust 2.26.0__tar.gz → 2.26.1.dev12__tar.gz

{locust-2.26.0 → locust-2.26.1.dev12}/.github/workflows/tests.yml

@@ -151,7 +151,7 @@ jobs:
           python -m build
           echo "TAG=${GITHUB_REF#refs/*/}" | tee -a $GITHUB_ENV
       - name: Publish tagged version to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
@@ -190,7 +190,7 @@ jobs:
           python -m build
       - name: Publish prerelease version to PyPI
         if: ${{ env.NOT_MERGE_COMMIT == '' }}
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

{locust-2.26.0 → locust-2.26.1.dev12}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.7
+    rev: v0.3.7  # Pin the same version in the tox.ini file.
     hooks:
       # Run the linter.
       - id: ruff

{locust-2.26.0 → locust-2.26.1.dev12}/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Detailed changelog
 The most important changes can also be found in [the documentation](https://docs.locust.io/en/latest/changelog.html).
 
+## [2.26.0](https://github.com/locustio/locust/tree/2.26.0) (2024-04-18)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.25.0...2.26.0)
+
+**Merged pull requests:**
+
+- Reformat and lint stuff. And pin gevenhttpclient version [\#2682](https://github.com/locustio/locust/pull/2682) ([cyberw](https://github.com/cyberw))
+- Add ruff pre commit hook [\#2680](https://github.com/locustio/locust/pull/2680) ([cyberw](https://github.com/cyberw))
+- Remove python 3.8 compatibility code [\#2679](https://github.com/locustio/locust/pull/2679) ([cyberw](https://github.com/cyberw))
+- Drop support for Python 3.8 [\#2677](https://github.com/locustio/locust/pull/2677) ([cyberw](https://github.com/cyberw))
+- Update geventhttpclient and adjust FastHttpUser max\_retries / max\_redirects [\#2676](https://github.com/locustio/locust/pull/2676) ([cyberw](https://github.com/cyberw))
+
 ## [2.25.0](https://github.com/locustio/locust/tree/2.25.0) (2024-04-14)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.24.1...2.25.0)

{locust-2.26.0/locust.egg-info → locust-2.26.1.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.26.0
+Version: 2.26.1.dev12
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust

{locust-2.26.0 → locust-2.26.1.dev12}/benchmarks/dispatch.py

@@ -566,19 +566,19 @@ if __name__ == "__main__":
             all_dispatched_users_ramp_down = list(users_dispatcher)
             dispatch_iteration_durations_ramp_down = users_dispatcher.dispatch_iteration_durations[:]
 
-            cpu_ramp_up = "{:3.3f}/{:3.3f}/{:3.3f}".format(
+            cpu_ramp_up = "{:3.3f}/{:3.3f}/{:3.3f}".format(  # noqa: UP032
                 1000 * statistics.mean(dispatch_iteration_durations_ramp_up),
                 1000 * min(dispatch_iteration_durations_ramp_up),
                 1000 * max(dispatch_iteration_durations_ramp_up),
-            )
-            cpu_ramp_down = "{:3.3f}/{:3.3f}/{:3.3f}".format(
+            )  # noqa: UP032
+            cpu_ramp_down = "{:3.3f}/{:3.3f}/{:3.3f}".format(  # noqa: UP032
                 1000 * statistics.mean(dispatch_iteration_durations_ramp_down),
                 1000 * min(dispatch_iteration_durations_ramp_down),
                 1000 * max(dispatch_iteration_durations_ramp_down),
             )
 
             print(
-                "{:04.0f}/{:04.0f} - {:,} workers - {:,} users - {} user classes - {:,} users/s - instantiate: {:.3f}ms - new_dispatch (ramp-up/ramp-down): {:.3f}ms/{:.3f}ms - cpu_ramp_up: {}ms - cpu_ramp_down: {}ms".format(
+                "{:04.0f}/{:04.0f} - {:,} workers - {:,} users - {} user classes - {:,} users/s - instantiate: {:.3f}ms - new_dispatch (ramp-up/ramp-down): {:.3f}ms/{:.3f}ms - cpu_ramp_up: {}ms - cpu_ramp_down: {}ms".format(  # noqa: UP032
                     case_index + 1,
                     case_count,
                     worker_count,

{locust-2.26.0 → locust-2.26.1.dev12}/examples/rest.py

@@ -50,7 +50,7 @@ class MyUser(FastHttpUser):
         with self.rest("POST", "/post", json={"foo": 1}) as resp:
             1 / 0  # pylint: disable=pointless-statement
 
-        # response isnt even json, but RestUser will already have been marked it as a failure, so we dont have to do it again
+        # response isn't even json, but RestUser will already have been marked it as a failure, so we dont have to do it again
         with self.rest("GET", "/") as resp:
             pass
 

{locust-2.26.0 → locust-2.26.1.dev12}/examples/web_ui_cache_stats.py

@@ -38,7 +38,7 @@ class WebsiteUser(HttpUser):
 
 
 # This example is based on the Varnish hit/miss headers (https://docs.varnish-software.com/tutorials/hit-miss-logging/).
-# It could easly be customised for matching other caching sytems, CDN or custom headers.
+# It could easily be customised for matching other caching systems, CDN or custom headers.
 CACHE_HEADER = "X-Cache"
 
 cache_stats = {}

{locust-2.26.0 → locust-2.26.1.dev12}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.26.0'
-__version_tuple__ = version_tuple = (2, 26, 0)
+__version__ = version = '2.26.1.dev12'
+__version_tuple__ = version_tuple = (2, 26, 1, 'dev12')

{locust-2.26.0 → locust-2.26.1.dev12}/locust/dispatch.py

@@ -100,8 +100,7 @@ class UsersDispatcher(Iterator):
         self._no_user_to_spawn = False
 
     def get_current_user_count(self) -> int:
-        # need to ignore type due to https://github.com/python/mypy/issues/1507
-        return sum(map(sum, map(dict.values, self._users_on_workers.values())))  # type: ignore
+        return sum(map(sum, map(dict.values, self._users_on_workers.values())))
 
     @property
     def dispatch_in_progress(self):
@@ -449,5 +448,4 @@ class UsersDispatcher(Iterator):
         The implementation was profiled and compared to other implementations such as dict-comprehensions
         and the one below is the most efficient.
         """
-        # type is ignored due to: https://github.com/python/mypy/issues/1507
-        return dict(zip(users_on_workers.keys(), map(dict.copy, users_on_workers.values())))  # type: ignore
+        return dict(zip(users_on_workers.keys(), map(dict.copy, users_on_workers.values())))

{locust-2.26.0 → locust-2.26.1.dev12}/locust/input_events.py

@@ -56,7 +56,7 @@ class WindowsKeyPoller:
                 self.cur_keys_length = 0
                 self.captured_chars = []
             except pywintypes.error:
-                raise InitError("Terminal says its a tty but we couldnt enable line input. Keyboard input disabled.")
+                raise InitError("Terminal says its a tty but we couldn't enable line input. Keyboard input disabled.")
         else:
             raise InitError("Terminal was not a tty. Keyboard input disabled")
 

{locust-2.26.0 → locust-2.26.1.dev12}/locust/main.py

@@ -220,7 +220,7 @@ def main():
                 children.append(child_pid)
                 logging.debug(f"Started child worker with pid #{child_pid}")
             else:
-                # child is always a worker, even when it wasnt set on command line
+                # child is always a worker, even when it wasn't set on command line
                 options.worker = True
                 # remove options that dont make sense on worker
                 options.run_time = None

{locust-2.26.0 → locust-2.26.1.dev12}/locust/rpc/protocol.py

@@ -5,7 +5,7 @@ import datetime
 import msgpack
 
 try:
-    from bson import ObjectId  # type: ignore
+    from bson import ObjectId
 except ImportError:
 
     class ObjectId:  # type: ignore

{locust-2.26.0 → locust-2.26.1.dev12}/locust/runners.py

@@ -345,10 +345,10 @@ class Runner:
                 return
             elif self.shape_last_tick != current_tick:
                 if len(current_tick) == 2:
-                    user_count, spawn_rate = current_tick  # type: ignore
+                    user_count, spawn_rate = current_tick
                     user_classes = None
                 else:
-                    user_count, spawn_rate, user_classes = current_tick  # type: ignore
+                    user_count, spawn_rate, user_classes = current_tick
                 logger.info("Shape test updating to %d users at %.2f spawn rate" % (user_count, spawn_rate))
                 # TODO: This `self.start()` call is blocking until the ramp-up is completed. This can leads
                 #       to unexpected behaviours such as the one in the following example:
@@ -378,7 +378,7 @@ class Runner:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             logger.debug(f"Stopping all users (called from {caller.filename}:{caller.lineno})")
         except Exception:
-            logger.debug("Stopping all users (couldnt determine where stop() was called from)")
+            logger.debug("Stopping all users (couldn't determine where stop() was called from)")
         self.environment.events.test_stopping.fire(environment=self.environment)
         self.final_user_classes_count = {**self.user_classes_count}
         self.update_state(STATE_CLEANUP)
@@ -1453,7 +1453,7 @@ class WorkerRunner(DistributedRunner):
 
 
 def _format_user_classes_count_for_log(user_classes_count: dict[str, int]) -> str:
-    return "{} ({} total users)".format(
+    return "{} ({} total users)".format(  # noqa: UP032
         json.dumps(dict(sorted(user_classes_count.items(), key=itemgetter(0)))),
         sum(user_classes_count.values()),
     )

{locust-2.26.0 → locust-2.26.1.dev12}/locust/test/mock_locustfile.py

@@ -1,10 +1,8 @@
 import os
 import random
 import time
-
 from contextlib import contextmanager
 
-
 MOCK_LOCUSTFILE_CONTENT = '''
 """This is a mock locust file for unit testing"""
 

{locust-2.26.0 → locust-2.26.1.dev12}/locust/test/test_dispatch.py

@@ -4129,7 +4129,7 @@ def _aggregate_dispatched_users(d: dict[str, dict[str, int]]) -> dict[str, int]:
 
 
 def _user_count(d: dict[str, dict[str, int]]) -> int:
-    return sum(map(sum, map(dict.values, d.values())))  # type: ignore
+    return sum(map(sum, map(dict.values, d.values())))
 
 
 def _user_count_on_worker(d: dict[str, dict[str, int]], worker_node_id: str) -> int:

{locust-2.26.0 → locust-2.26.1.dev12}/locust/test/test_main.py

@@ -832,7 +832,7 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
     def test_web_options(self):
         port = get_free_tcp_port()
         if platform.system() != "Darwin":
-            # MacOS only sets up the loopback interface for 127.0.0.1 and not for 127.*.*.*, so we cant test this
+            # MacOS only sets up the loopback interface for 127.0.0.1 and not for 127.*.*.*, so we can't test this
             with mock_locustfile() as mocked:
                 proc = subprocess.Popen(
                     ["locust", "-f", mocked.file_path, "--web-host", "127.0.0.2", "--web-port", str(port)],

{locust-2.26.0 → locust-2.26.1.dev12}/locust/test/test_runners.py

@@ -3214,7 +3214,7 @@ class TestMasterRunner(LocustRunnerTestCase):
 
     def test_worker_sends_unrecognized_message_to_master(self):
         """
-        Validate master ignores message from worker when it cannot parse adddress info.
+        Validate master ignores message from worker when it cannot parse address info.
         """
 
         class TestUser(User):

{locust-2.26.0 → locust-2.26.1.dev12}/locust/test/test_stats.py

@@ -367,7 +367,7 @@ class TestStatsPrinting(LocustTestCase):
         headlines = info[1].replace("# ", "#").split()
         # check number of columns in headlines vs table ascii separator
         self.assertEqual(len(headlines), len(info[2].split("|")))
-        # table ascii seprators
+        # table ascii separators
         self.assertEqual(info[2], info[-2])
 
 

{locust-2.26.0 → locust-2.26.1.dev12}/locust/web.py

@@ -147,7 +147,7 @@ class WebUI:
         def handle_exception(error):
             error_message = str(error)
             logger.log(logging.CRITICAL, error_message)
-            return make_response(error_message, 500)
+            return make_response(error_message, getattr(error, "code", 500))
 
         @app.route("/assets/<path:path>")
         def send_assets(path):

{locust-2.26.0 → locust-2.26.1.dev12/locust.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.26.0
+Version: 2.26.1.dev12
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust

{locust-2.26.0 → locust-2.26.1.dev12}/tox.ini

@@ -32,7 +32,8 @@ commands =
     python -m unittest -f locust.test.test_main
 
 [testenv:ruff]
-deps = ruff==0.3.0
+deps = ruff==0.3.7
+; Pin the same version in the .pre-commit-config.yaml file.
 commands = 
     ruff check .
     ruff format --check