locust 2.37.4.dev1__py3-none-any.whl → 2.37.5.dev6__py3-none-any.whl

locust/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.37.4.dev1'
-__version_tuple__ = version_tuple = (2, 37, 4, 'dev1')
+__version__ = version = '2.37.5.dev6'
+__version_tuple__ = version_tuple = (2, 37, 5, 'dev6')

locust/argument_parser.py

@@ -4,6 +4,7 @@ import locust
 from locust import runners
 from locust.rpc import Message, zmqrpc
 
+import argparse
 import ast
 import atexit
 import json
@@ -283,25 +284,7 @@ def download_locustfile_from_master(master_host: str, master_port: int) -> str:
     return msg.data.get("locustfiles", [])
 
 
-def parse_locustfiles_from_master(locustfile_sources) -> list[str]:
-    locustfiles = []
-
-    for source in locustfile_sources:
-        if "contents" in source:
-            filename = source["filename"]
-            file_contents = source["contents"]
-
-            with open(os.path.join(tempfile.gettempdir(), filename), "w", encoding="utf-8") as locustfile:
-                locustfile.write(file_contents)
-
-            locustfiles.append(locustfile.name)
-        else:
-            locustfiles.append(source)
-
-    return locustfiles
-
-
-def parse_locustfile_option(args=None) -> list[str]:
+def parse_locustfile_option(args=None) -> tuple[argparse.Namespace, list[str]]:
     """
     Construct a command line parser that is only used to parse the -f argument so that we can
     import the test scripts in case any of them adds additional command line arguments to the
@@ -346,38 +329,51 @@ def parse_locustfile_option(args=None) -> list[str]:
         env_var="LOCUST_MASTER_NODE_PORT",
     )
 
-    options, _ = parser.parse_known_args(args=args)
+    options, unknown = parser.parse_known_args(args=args)
 
     if options.help or options.version:
         # if --help or --version is specified we'll call parse_options which will print the help/version message
         parse_options(args=args)
 
+    return (options, unknown)
+
+
+def get_locustfiles_locally(options):
     if options.locustfile == "-":
-        if not options.worker:
-            sys.stderr.write(
-                "locustfile was set to '-' (meaning to download from master) but --worker was not specified.\n"
-            )
-            sys.exit(1)
-        # having this in argument_parser module is a bit weird, but it needs to be done early
-        locustfile_sources = download_locustfile_from_master(options.master_host, options.master_port)
-        locustfile_list = parse_locustfiles_from_master(locustfile_sources)
+        locustfile_list = retrieve_locustfiles_from_master(options)
     else:
         locustfile_list = [f.strip() for f in options.locustfile.split(",")]
 
-    parsed_paths = parse_locustfile_paths(locustfile_list)
+    return parse_locustfile_paths(locustfile_list)
+
 
-    if not parsed_paths:
-        note_about_file_endings = ""
-        user_friendly_locustfile_name = options.locustfile
+def parse_locustfiles_from_master(locustfile_sources) -> list[str]:
+    locustfiles = []
 
-        if not options.locustfile.endswith(".py"):
-            note_about_file_endings = "Ensure your locustfile ends with '.py' or is a directory with parsed_paths. "
+    for source in locustfile_sources:
+        if "contents" in source:
+            filename = source["filename"]
+            file_contents = source["contents"]
+
+            with open(os.path.join(tempfile.gettempdir(), filename), "w", encoding="utf-8") as locustfile:
+                locustfile.write(file_contents)
+
+            locustfiles.append(locustfile.name)
+        else:
+            locustfiles.append(source)
+
+    return locustfiles
+
+
+def retrieve_locustfiles_from_master(options) -> list[str]:
+    if not options.worker:
         sys.stderr.write(
-            f"Could not find '{user_friendly_locustfile_name}'. {note_about_file_endings}See --help for available options.\n"
+            "locustfile was set to '-' (meaning to download from master) but --worker was not specified.\n"
         )
         sys.exit(1)
-
-    return parsed_paths
+    # having this in argument_parser module is a bit weird, but it needs to be done early
+    locustfile_sources = download_locustfile_from_master(options.master_host, options.master_port)
+    return parse_locustfiles_from_master(locustfile_sources)
 
 
 # A hack for setting up an action that raises ArgumentError with configurable error messages.

locust/main.py

@@ -20,7 +20,11 @@ from typing import TYPE_CHECKING
 import gevent
 
 from . import log, stats
-from .argument_parser import parse_locustfile_option, parse_options
+from .argument_parser import (
+    get_locustfiles_locally,
+    parse_locustfile_option,
+    parse_options,
+)
 from .env import Environment
 from .html import get_html_report, process_html_filename
 from .input_events import input_listener
@@ -156,7 +160,12 @@ def merge_locustfiles_content(
 def main():
     # find specified locustfile(s) and make sure it exists, using a very simplified
     # command line parser that is only used to parse the -f option.
-    locustfiles = parse_locustfile_option()
+    options, unknown = parse_locustfile_option()
+
+    if any([flag for flag in ["--login", "--logout", "--delete"] if flag in unknown]):
+        sys.exit(locust_cloud.main())
+
+    locustfiles = get_locustfiles_locally(options)
 
     # Importing Locustfile(s) - setting available UserClasses and ShapeClasses to choose from in UI
     (
@@ -166,14 +175,14 @@ def main():
         shape_class,
     ) = merge_locustfiles_content(locustfiles)
 
-    stats.validate_stats_configuration()
-
     # parse all command line options
     options = parse_options()
 
     if getattr(options, "cloud", None):
         sys.exit(locust_cloud.main())
 
+    stats.validate_stats_configuration()
+
     if options.headful:
         options.headless = False
 

{locust-2.37.4.dev1.dist-info → locust-2.37.5.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.37.4.dev1
+Version: 2.37.5.dev6
 Summary: Developer-friendly load testing framework
 Project-URL: homepage, https://locust.io/
 Project-URL: repository, https://github.com/locustio/locust
@@ -30,7 +30,7 @@ Requires-Dist: flask-login>=0.6.3
 Requires-Dist: flask>=2.0.0
 Requires-Dist: gevent<25.0.0,>=24.10.1
 Requires-Dist: geventhttpclient>=2.3.1
-Requires-Dist: locust-cloud>=1.21.5
+Requires-Dist: locust-cloud>=1.21.7
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: psutil>=5.9.1
 Requires-Dist: pywin32; sys_platform == 'win32'

{locust-2.37.4.dev1.dist-info → locust-2.37.5.dev6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 locust/__init__.py,sha256=aWeuBPUxONjwNm1xp4v8L4BO14SuYLjscIiwJVX1Ui4,1746
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=47JK67mtjYv54zlxqNIFlVBMeNg9cXHDGgX6Hns-hVg,526
-locust/argument_parser.py,sha256=JDZftZ1sGknDXzYy-UrGndX7mGJUMhEjvruRjQjbNM4,33190
+locust/_version.py,sha256=bA8RW_gEDOlHz5Zs0tyAlwpTNdv1erAUkKg84SaYLmM,526
+locust/argument_parser.py,sha256=udbiBhZQfJVVIcLb4zHXRs7u4sQBl02_rogEUazfDik,32890
 locust/clients.py,sha256=o-277lWQdpmPnoRTdf3IQVNPQT8LMFDtPtuxbLHQIIs,19286
 locust/debug.py,sha256=7CCm8bIg44uGH2wqBlo1rXBzV2VzwPicLxLewz8r5CQ,5099
 locust/dispatch.py,sha256=prdwtb9EoN4A9klgiKgWuwQmvFB8hEuFHOK6ot62AJI,16202
@@ -11,7 +11,7 @@ locust/exception.py,sha256=jGgJ32ubuf4pWdlaVOkbh2Y0LlG0_DHi-lv3ib8ppOE,1791
 locust/html.py,sha256=VjoAEZEolJ8il4HLACBlVA81Qk36fBwlDj_7ojAEFss,4132
 locust/input_events.py,sha256=lqLDB2Ax-OQ7-vtYNkGjySjfaWVobBzqf0GxRwjcLcQ,3323
 locust/log.py,sha256=5E2ZUOa3V4sfCqa-470Gle1Ik9L5nxYitsjEB9tRwE0,3455
-locust/main.py,sha256=wY0FexiakPzK1oR4VbSzCQn3ARPsKZHWmhrObR9JWSI,28174
+locust/main.py,sha256=6SVMbo2qcQGbWMz2xUixO7eegayQz2VCrQaMN4-kIh8,28399
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
 locust/runners.py,sha256=niYmGsfOpxMfVmTXGod4MYTefpaZ2wirFlhqxRw5mq4,70617
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
@@ -51,8 +51,8 @@ locust/webui/dist/assets/graphs-light.png,sha256=7L6pOehXqCojQclzeP91l-LskFQAw_n
 locust/webui/dist/assets/index-Ufqx__MB.js,sha256=u9rbp7FXKwz3_7tA7fVBvRjWf_KUQFIL-yF3AN9YsD4,1722583
 locust/webui/dist/assets/testruns-dark.png,sha256=np6MvpgJ2gkKQ66SOmukLtjsMtHqTSr5dNfza-2XtCo,267621
 locust/webui/dist/assets/testruns-light.png,sha256=iLAxBZh3kRsfGkcB1-1KSAbFgGji43IqiUrYuJlUoPk,276839
-locust-2.37.4.dev1.dist-info/METADATA,sha256=s-VhaPiv5hv9kZWbywRXRVm8saHD73SMSra3go1pFs4,9403
-locust-2.37.4.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust-2.37.4.dev1.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.37.4.dev1.dist-info/licenses/LICENSE,sha256=5hnz-Vpj0Z3kSCQl0LzV2hT1TLc4LHcbpBp3Cy-EuyM,1110
-locust-2.37.4.dev1.dist-info/RECORD,,
+locust-2.37.5.dev6.dist-info/METADATA,sha256=zKGkxzh6IYfJqBtTA7JT8ZGSXmpvaG--bRz1H0KRIwU,9403
+locust-2.37.5.dev6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+locust-2.37.5.dev6.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.37.5.dev6.dist-info/licenses/LICENSE,sha256=5hnz-Vpj0Z3kSCQl0LzV2hT1TLc4LHcbpBp3Cy-EuyM,1110
+locust-2.37.5.dev6.dist-info/RECORD,,