locust 2.22.1.dev65__tar.gz → 2.23.0__tar.gz

{locust-2.22.1.dev65 → locust-2.23.0}/.github/workflows/tests.yml

@@ -15,11 +15,11 @@ jobs:
       matrix:
         include:
           - {name: Windows, python: '3.12', os: windows-latest, tox: fail_fast_test_main}
-          - {name: Mac, python: '3.12', os: macos-latest, tox: fail_fast_test_main}
+          # - {name: Mac, python: '3.12', os: macos-latest, tox: fail_fast_test_main}
           - { name: "ruff", python: "3.11", os: ubuntu-latest, tox: "ruff" }
           - { name: "mypy", python: "3.10", os: ubuntu-latest, tox: "mypy" }
           # run some integration tests and abort immediately if they fail, for faster feedback
-          - { name: "fail_fast_test_main", python: "3.12", os: ubuntu-latest, tox: fail_fast_test_main }
+          - { name: "Linux", python: "3.12", os: ubuntu-latest, tox: fail_fast_test_main }
           - { name: "3.12", python: "3.12", os: ubuntu-latest, tox: py312 }
           - { name: "3.11", python: "3.11", os: ubuntu-latest, tox: py311 }
           - { name: "3.10", python: "3.10", os: ubuntu-latest, tox: py310 }

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

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

{locust-2.22.1.dev65 → locust-2.23.0}/docs/changelog.rst

@@ -4,6 +4,13 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+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)
+* Locustfile distribution from master to worker https://github.com/locustio/locust/pull/2583
+* Allow getting locust files from http urls https://github.com/locustio/locust/pull/2595
+* Use exec_module() when loading locustfile instead of the deprecated load_module() https://github.com/locustio/locust/pull/2576
+
 2.22.0
 ======
 * Use Modern UI by default, remove --modern-ui and add --legacy-ui parameters https://github.com/locustio/locust/pull/2569

{locust-2.22.1.dev65 → locust-2.23.0}/docs/configuration.rst

@@ -124,6 +124,15 @@ Example:
 
 Locust will use ``locustfile1.py``, ``locustfile2.py`` & ``more_files/locustfile3.py``
 
+You can also use ``-f/--locustfile`` for web urls. This will download the file and use it as any normal locustfile.
+
+Example:
+
+.. code-block:: console
+
+    $ locust -f https://raw.githubusercontent.com/locustio/locust/master/examples/basic.py
+
+
 .. _class-picker:
 
 Running Locust with User class UI picker
@@ -242,4 +251,3 @@ The list of statistics parameters that can be modified is:
 | PERCENTILES_TO_STATISTICS                 | List of response time percentiles in the screen of statistics for Web UI             |
 |                                           | This parameter supports only modern UI                                               |
 +-------------------------------------------+--------------------------------------------------------------------------------------+
-

{locust-2.22.1.dev65 → locust-2.23.0}/docs/running-distributed.rst

@@ -42,7 +42,7 @@ And then on each worker machine:
 
 .. code-block:: bash
 
-    locust -f - --worker --master-host <your master's address> --processes 4
+    locust -f - --worker --master-host <your master> --processes 4
 
 .. note::
     The ``-f -`` argument tells Locust to get the locustfile from master instead of from its local filesystem. This feature was introduced in Locust 2.23.0.

{locust-2.22.1.dev65 → locust-2.23.0}/docs/testing-other-systems.rst

@@ -62,4 +62,3 @@ Other examples
 ==============
 
 See `locust-plugins <https://github.com/SvenskaSpel/locust-plugins#users>`_ it has users for WebSocket/SocketIO, Kafka, Selenium/WebDriver, Playwright and more.
-

{locust-2.22.1.dev65 → locust-2.23.0}/docs/what-is-locust.rst

@@ -71,4 +71,3 @@ License
 =======
 
 Open source licensed under the MIT license (see LICENSE file for details).
-

{locust-2.22.1.dev65 → locust-2.23.0}/locust/_version.py

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

{locust-2.22.1.dev65 → locust-2.23.0}/locust/argument_parser.py

@@ -4,17 +4,20 @@ import locust
 from locust import runners
 from locust.rpc import Message, zmqrpc
 
+import atexit
 import os
 import platform
 import socket
 import sys
+import tempfile
 import textwrap
 from typing import Any, NamedTuple
+from urllib.parse import urlparse
 from uuid import uuid4
 
 import configargparse
 import gevent
-from gevent.event import Event
+import requests
 
 version = locust.__version__
 
@@ -66,7 +69,7 @@ def _is_package(path):
     return os.path.isdir(path) and os.path.exists(os.path.join(path, "__init__.py"))
 
 
-def find_locustfile(locustfile):
+def find_locustfile(locustfile: str) -> str | None:
     """
     Attempt to locate a locustfile, either explicitly or by searching parent dirs.
     """
@@ -97,7 +100,8 @@ def find_locustfile(locustfile):
                 # we've reached the root path which has been checked this iteration
                 break
             path = parent_path
-    # Implicit 'return None' if nothing was found
+
+    return None
 
 
 def find_locustfiles(locustfiles: list[str], is_directory: bool) -> list[str]:
@@ -141,6 +145,34 @@ def find_locustfiles(locustfiles: list[str], is_directory: bool) -> list[str]:
     return file_paths
 
 
+def is_url(url: str) -> bool:
+    try:
+        result = urlparse(url)
+        if result.scheme == "https" or result.scheme == "http":
+            return True
+        else:
+            return False
+    except ValueError:
+        return False
+
+
+def download_file_from_url(url: str) -> str:
+    try:
+        response = requests.get(url)
+    except requests.exceptions.RequestException as e:
+        sys.stderr.write(f"Failed to get locustfile from: {url}. Exception: {e}")
+        sys.exit(1)
+
+    with open(os.path.join(tempfile.gettempdir(), url.rsplit("/", 1)[-1]), "w") as locustfile:
+        locustfile.write(response.text)
+
+    def exit_handler():
+        os.remove(locustfile.name)
+
+    atexit.register(exit_handler)
+    return locustfile.name
+
+
 def get_empty_argument_parser(add_help=True, default_config_files=DEFAULT_CONFIG_FILES) -> LocustArgumentParser:
     parser = LocustArgumentParser(
         default_config_files=default_config_files,
@@ -279,7 +311,9 @@ def parse_locustfile_option(args=None) -> list[str]:
         return [filename]
 
     # Comma separated string to list
-    locustfile_as_list = [locustfile.strip() for locustfile in options.locustfile.split(",")]
+    locustfile_as_list = [
+        download_file_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
     if locustfile_is_directory(locustfile_as_list):
@@ -298,8 +332,8 @@ def parse_locustfile_option(args=None) -> list[str]:
             locustfile = None
         else:
             # Is a single file
-            locustfile = find_locustfile(options.locustfile)
-            locustfiles = [locustfile]
+            locustfile = find_locustfile(locustfile_as_list[0])
+            locustfiles = []
 
             if not locustfile:
                 if options.help or options.version:
@@ -317,6 +351,8 @@ def parse_locustfile_option(args=None) -> list[str]:
                     f"Could not find '{user_friendly_locustfile_name}'. {note_about_file_endings}See --help for available options.\n"
                 )
                 sys.exit(1)
+            else:
+                locustfiles.append(locustfile)
 
     return locustfiles
 

{locust-2.22.1.dev65 → locust-2.23.0}/locust/test/test_load_locustfile.py

@@ -1,10 +1,12 @@
 from locust import main
-from locust.argument_parser import parse_options
+from locust.argument_parser import parse_locustfile_option, parse_options
 from locust.main import create_environment
 from locust.user import HttpUser, TaskSet, User
 from locust.util.load_locustfile import is_user_class
 
+import filecmp
 import os
+import pathlib
 import textwrap
 
 from .mock_locustfile import MOCK_LOCUSTFILE_CONTENT, mock_locustfile
@@ -209,3 +211,18 @@ class TestLoadLocustfile(LocustTestCase):
                 ]
             )
             self.assertEqual("my_locust_file.py", options.locustfile)
+
+    def test_locustfile_from_url(self):
+        locustfiles = parse_locustfile_option(
+            args=[
+                "-f",
+                "https://raw.githubusercontent.com/locustio/locust/master/examples/basic.py",
+            ]
+        )
+        self.assertEqual(len(locustfiles), 1)
+        self.assertTrue(
+            filecmp.cmp(
+                locustfiles[0],
+                f"{os.getcwd()}/examples/basic.py",
+            )
+        )