locust 2.23.0__tar.gz → 2.23.1__tar.gz

{locust-2.23.0 → locust-2.23.1}/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.23.0](https://github.com/locustio/locust/tree/2.23.0) (2024-02-11)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.22.0...2.23.0)
+
+**Closed issues:**
+
+- Modern UI: ability to sort tables by column specific column [\#2593](https://github.com/locustio/locust/issues/2593)
+- Modern UI -  User class picker - add option to enable/disable everything. [\#2585](https://github.com/locustio/locust/issues/2585)
+- \[LocustLineChart\] Implement an option/configuration for users to customize the color of the LocustLineChart. [\#2578](https://github.com/locustio/locust/issues/2578)
+
+**Merged pull requests:**
+
+- Tables are Sortable by Default [\#2596](https://github.com/locustio/locust/pull/2596) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Allow getting locust files from http urls [\#2595](https://github.com/locustio/locust/pull/2595) ([DennisKrone](https://github.com/DennisKrone))
+- Fixed typos in documentation [\#2592](https://github.com/locustio/locust/pull/2592) ([dorin131](https://github.com/dorin131))
+- Remove no longer relevant documentation and \(already not working?\) checks for not loading locustfiles named locust.py [\#2591](https://github.com/locustio/locust/pull/2591) ([cyberw](https://github.com/cyberw))
+- Add Select All / None Checkbox to User Class Picker [\#2590](https://github.com/locustio/locust/pull/2590) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Add New Colors for the Locust Charts [\#2589](https://github.com/locustio/locust/pull/2589) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Work around issue with locustfiles named "locust.py" [\#2587](https://github.com/locustio/locust/pull/2587) ([cyberw](https://github.com/cyberw))
+- Update writing-a-locustfile.rst [\#2584](https://github.com/locustio/locust/pull/2584) ([KaushikPathak90](https://github.com/KaushikPathak90))
+- Locustfile distribution from master to worker [\#2583](https://github.com/locustio/locust/pull/2583) ([cyberw](https://github.com/cyberw))
+- Gh actions: Run tests on MacOS [\#2580](https://github.com/locustio/locust/pull/2580) ([cyberw](https://github.com/cyberw))
+- Use defaultdict:s for stats dictionaries instead of setdefault [\#2579](https://github.com/locustio/locust/pull/2579) ([cyberw](https://github.com/cyberw))
+- DeprecationWarning: the load\_module\(\) method is deprecated and slated for removal in Python 3.12; use exec\_module\(\) instead [\#2576](https://github.com/locustio/locust/pull/2576) ([mgor](https://github.com/mgor))
+- docs\(running-distributed\): cores -\> logical cores [\#2570](https://github.com/locustio/locust/pull/2570) ([tdadela](https://github.com/tdadela))
+
 ## [2.22.0](https://github.com/locustio/locust/tree/2.22.0) (2024-02-04)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.21.0...2.22.0)

{locust-2.23.0/locust.egg-info → locust-2.23.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.23.0
+Version: 2.23.1
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://locust.io/

{locust-2.23.0 → locust-2.23.1}/docs/changelog.rst

@@ -4,6 +4,11 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.23.1
+======
+* Fixes for locustfile download https://github.com/locustio/locust/pull/2599
+* UI fixes https://github.com/locustio/locust/pull/2600 https://github.com/locustio/locust/pull/2601
+
 2.23.0
 ======
 * UI updates (https://github.com/locustio/locust/pull/2589, https://github.com/locustio/locust/pull/2590, https://github.com/locustio/locust/pull/2596)

{locust-2.23.0 → locust-2.23.1}/docs/configuration.rst

@@ -248,6 +248,8 @@ The list of statistics parameters that can be modified is:
 +-------------------------------------------+--------------------------------------------------------------------------------------+
 | PERCENTILES_TO_CHART                      | List of response time percentiles in the screen of chart for Web UI                  |
 +-------------------------------------------+--------------------------------------------------------------------------------------+
+| MODERN_UI_PERCENTILES_TO_CHART            | List of response time percentiles in the screen of chart for the modern Web UI       |
++-------------------------------------------+--------------------------------------------------------------------------------------+
 | PERCENTILES_TO_STATISTICS                 | List of response time percentiles in the screen of statistics for Web UI             |
 |                                           | This parameter supports only modern UI                                               |
 +-------------------------------------------+--------------------------------------------------------------------------------------+

{locust-2.23.0 → locust-2.23.1}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.23.0'
-__version_tuple__ = version_tuple = (2, 23, 0)
+__version__ = version = '2.23.1'
+__version_tuple__ = version_tuple = (2, 23, 1)

{locust-2.23.0 → locust-2.23.1}/locust/argument_parser.py

@@ -156,7 +156,7 @@ def is_url(url: str) -> bool:
         return False
 
 
-def download_file_from_url(url: str) -> str:
+def download_locustfile_from_url(url: str) -> str:
     try:
         response = requests.get(url)
     except requests.exceptions.RequestException as e:
@@ -167,7 +167,10 @@ def download_file_from_url(url: str) -> str:
         locustfile.write(response.text)
 
     def exit_handler():
-        os.remove(locustfile.name)
+        try:
+            os.remove(locustfile.name)
+        except FileNotFoundError:
+            pass  # this is normal when multiple workers are running on the same machine
 
     atexit.register(exit_handler)
     return locustfile.name
@@ -246,11 +249,19 @@ def download_locustfile_from_master(master_host: str, master_port: int) -> str:
         sys.exit(1)
 
     filename = msg.data["filename"]
-    with open(filename, "w") as local_file:
-        local_file.write(msg.data["contents"])
+    with open(os.path.join(tempfile.gettempdir(), filename), "w") as locustfile:
+        locustfile.write(msg.data["contents"])
+
+    def exit_handler():
+        try:
+            os.remove(locustfile.name)
+        except FileNotFoundError:
+            pass  # this is normal when multiple workers are running on the same machine
+
+    atexit.register(exit_handler)
 
     tempclient.close()
-    return filename
+    return locustfile.name
 
 
 def parse_locustfile_option(args=None) -> list[str]:
@@ -312,7 +323,7 @@ def parse_locustfile_option(args=None) -> list[str]:
 
     # Comma separated string to list
     locustfile_as_list = [
-        download_file_from_url(f) if is_url(f.strip()) else f.strip() for f in options.locustfile.split(",")
+        download_locustfile_from_url(f) if is_url(f.strip()) else f.strip() for f in options.locustfile.split(",")
     ]
 
     # Checking if the locustfile is a single file, multiple files or a directory

{locust-2.23.0 → locust-2.23.1}/locust/main.py

@@ -132,6 +132,10 @@ def main():
         logging.error("stats.PERCENTILES_TO_CHART parameter should be 2 parameters \n")
         sys.exit(1)
 
+    if len(stats.MODERN_UI_PERCENTILES_TO_CHART) > 6:
+        logging.error("stats.MODERN_UI_PERCENTILES_TO_CHART parameter should be a maximum of 6 parameters \n")
+        sys.exit(1)
+
     def is_valid_percentile(parameter):
         try:
             if 0 < float(parameter) < 1:

{locust-2.23.0 → locust-2.23.1}/locust/runners.py

@@ -1064,7 +1064,7 @@ class MasterRunner(DistributedRunner):
                     self.send_message(
                         "locustfile",
                         client_id=client_id,
-                        data={"filename": filename, "contents": file_contents},
+                        data={"filename": os.path.basename(filename), "contents": file_contents},
                     )
                 continue
             elif msg.type == "client_stopped":

{locust-2.23.0 → locust-2.23.1}/locust/test/test_main.py

@@ -1721,12 +1721,15 @@ class SecondUser(HttpUser):
                 text=True,
             )
             stdout = proc.communicate()[0]
-            proc_worker2.communicate()
-            proc_worker.communicate()
+            stdout_worker = proc_worker.communicate()[0]
+            stdout_worker2 = proc_worker2.communicate()[0]
 
             self.assertIn('All users spawned: {"User1": 1} (1 total users)', stdout)
             self.assertIn("Locustfile contents changed on disk after first worker requested locustfile", stdout)
             self.assertIn("Shutting down (exit code 0)", stdout)
+            self.assertNotIn("Traceback", stdout)
+            self.assertNotIn("Traceback", stdout_worker)
+            self.assertNotIn("Traceback", stdout_worker2)
 
             self.assertEqual(0, proc.returncode)
             self.assertEqual(0, proc_worker.returncode)