Merge branch 'master' into fix-2575-invalid-host

Author: ilyabe

.git-blame-ignore-revs

@@ -11,3 +11,5 @@ b5324820b299b1fe7da0608f0cc8ec47f58b1e40
 60f3bceacc4ab9567433d40ae3ed280750f55ff1
 # sort imports using ruff
 f99e9df700a8020e4c1967eb42dcb37ddd26e296
+# apply ruff 0.3.0
+64428a0b4dfc75a00b175b4231db33704d8f5d36

.gitignore

@@ -29,3 +29,4 @@ __pycache__
 yarn-error.log
 .venv
 .DS_Store
+.python-version

CHANGELOG.md

@@ -1,6 +1,32 @@
 # Detailed changelog
 The most important changes can also be found in [the documentation](https://docs.locust.io/en/latest/changelog.html).
 
+## [2.24.0](https://github.com/locustio/locust/tree/2.24.0) (2024-02-29)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.23.1...2.24.0)
+
+**Fixed bugs:**
+
+- Blank page when accessing Locust Web UI via reverse proxy with subpath [\#2614](https://github.com/locustio/locust/issues/2614)
+- \[Report\]\[Modern-UI\] HTML report is blank [\#2603](https://github.com/locustio/locust/issues/2603)
+
+**Closed issues:**
+
+- SocketIOUser send method supports specific subscribe request [\#2616](https://github.com/locustio/locust/issues/2616)
+- "Sticky" user types on workers [\#2522](https://github.com/locustio/locust/issues/2522)
+
+**Merged pull requests:**
+
+- Modern UI - Fix logo asset [\#2618](https://github.com/locustio/locust/pull/2618) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Bugfix/2614 relative assets and stats links [\#2615](https://github.com/locustio/locust/pull/2615) ([skyanth](https://github.com/skyanth))
+- \[Modern UI\] Refactor and Add Tests for Entrypoints [\#2613](https://github.com/locustio/locust/pull/2613) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Implement pyproject.toml support for Locust configuration [\#2612](https://github.com/locustio/locust/pull/2612) ([alzex3](https://github.com/alzex3))
+- Update Header Logo to Higher Resolution for the Modern UI [\#2611](https://github.com/locustio/locust/pull/2611) ([FooQoo](https://github.com/FooQoo))
+- \[Report\]\[Modern-UI\] HTML report is blank [\#2609](https://github.com/locustio/locust/pull/2609) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- pluggable dispatcher logic [\#2606](https://github.com/locustio/locust/pull/2606) ([mgor](https://github.com/mgor))
+- Modern UI: Change Footer to Static Positioning [\#2605](https://github.com/locustio/locust/pull/2605) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Check that locustfile downloaded from URL is valid Python code [\#2604](https://github.com/locustio/locust/pull/2604) ([DennisKrone](https://github.com/DennisKrone))
+
 ## [2.23.1](https://github.com/locustio/locust/tree/2.23.1) (2024-02-11)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.23.0...2.23.1)

docs/changelog.rst

@@ -4,6 +4,12 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.24.0
+======
+* Pluggable dispatcher logic https://github.com/locustio/locust/pull/2606
+* pyproject.toml support for Locust configuration file https://github.com/locustio/locust/pull/2612
+* Minor fixes
+
 2.23.1
 ======
 * Fixes for locustfile download https://github.com/locustio/locust/pull/2599
@@ -542,7 +548,7 @@ instance, as one would expect. For tasks defined under a :py:class:`TaskSet <loc
 would refer to the ``TaskSet`` instance.
 
 The ``task_set`` attribute on the ``User`` class (previously ``Locust`` class) has been removed. To declare a 
-``User`` class with a single ``TaskSet`` one would now use the the :py:attr:`tasks <locust.User.tasks>` 
+``User`` class with a single ``TaskSet`` one would now use the :py:attr:`tasks <locust.User.tasks>`
 attribute instead:
 
 .. code-block:: python

docs/images/webui-splash-screenshot.png

@@ -90,6 +90,19 @@ For a complete example, see `rest.py <https://github.com/locustio/locust/blob/ma
     This feature is new and details of its interface/implementation may change in new versions of Locust.
 
 
+Connection Handling
+===================
+
+By default a user will reuse the same TCP/HTTP connection if possible. To more realistically simulate new users connecting to your application this connection can be manually closed.
+
+.. code-block:: python
+
+        @task
+        def t(self):
+            self.client.client.clientpool.close()
+            self.client.get("/") # Here a new connection will be created
+
+
 API
 ===
 

docs/increase-performance.rst

@@ -2,14 +2,6 @@
 Locust Documentation
 =====================
 
-.. sidebar:: About locust
-
-    Locust is a scalable load testing framework written in Python
-
-    * **Website**: `https://locust.io/ <https://locust.io/>`_
-    * **Source code**: `https://github.com/locustio/locust <https://github.com/locustio/locust>`_
-    * **Twitter**: `@locustio <https://twitter.com/locustio>`_
-
 
 Getting started
 ---------------

docs/index.rst

@@ -18,7 +18,6 @@ so using the root logger in your own test scripts will put the message into the
     import logging
     logging.info("this log message will go wherever the other locust log messages go")
 
-
 It's also possible to control the whole logging configuration in your own test scripts by using the 
 ``--skip-log-setup`` option. You will then have to 
 `configure the logging <https://docs.python.org/3/library/logging.config.html>`_ yourself.

docs/logging.rst

@@ -14,7 +14,6 @@ On Windows, this command will sometimes cause errors. Windows users should try u
 
     docker run -p 8089:8089 --mount type=bind,source=$pwd,target=/mnt/locust locustio/locust -f /mnt/locust/locustfile.py
 
-
 Docker Compose
 ==============
 
@@ -27,7 +26,6 @@ The above compose configuration could be used to start a master node and 4 worke
 
     docker-compose up --scale worker=4
 
-
 Use docker image as a base image
 ================================
 
@@ -37,7 +35,6 @@ official Locust docker image as a base image::
     FROM locustio/locust
     RUN pip3 install some-python-package
 
-
 Running a distributed load test on Kubernetes
 ==============================================