locust-cloud 1.23.3.dev3__tar.gz → 1.23.3.dev10__tar.gz

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/.github/workflows/daily-check.yml

@@ -2,7 +2,7 @@ name: Daily test run (api-dev)
 
 on:
   schedule: # 00:00, skipping Sunday and Monday
-    - cron: '0 0 * * 2-6'
+    - cron: "0 0 * * 2-6"
   workflow_dispatch:
 
 env:
@@ -26,7 +26,7 @@ jobs:
           fetch-tags: true
       - uses: actions/setup-python@v5
         with:
-            python-version: '3.11'
+          python-version: "3.11"
       - uses: astral-sh/setup-uv@v2
       - uses: actions/setup-node@v4
         with:
@@ -34,8 +34,8 @@ jobs:
       - run: uv venv --python 3.11
       # any local changes would make hatch-vcs set a "local version" (+dev0...), so we ignore any uv.lock updates:
       - run: git update-index --assume-unchanged uv.lock
-      - run: uv run locust-cloud --help
-      - run: uv run locust-cloud --profile status-checker --mock-server --autostart --autoquit 0 --run-time 1m --loglevel DEBUG --extra-files testdata/extra-files --extra-packages testdata/extra-package --requirements testdata/requirements.txt |& tee output.txt
+      - run: uvx --with . locust --cloud --help
+      - run: uvx --with . locust --cloud --profile status-checker --mock-server --autostart --autoquit 0 --run-time 1m --loglevel DEBUG --extra-files testdata/extra-files --extra-packages testdata/extra-package --requirements testdata/requirements.txt |& tee output.txt
       # check ok exit
       - run: grep -m 1 '(exit code 0)' output.txt
       # check extra files specified were available
@@ -55,4 +55,4 @@ jobs:
         run: curl -d "{\"text\":\"Failed run $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\"}" $SLACK_NOTIFICATIONS_WEBHOOK
       - name: Make sure to delete (only really needed for mock)
         if: always()
-        run: uv tool run locust-cloud --delete
+        run: uvx --with . locust --delete

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/.github/workflows/tests.yml

@@ -28,10 +28,10 @@ jobs:
       # This peculiar way of running pytest is to ensure monkey patching is done before pytest starts loading modules.
       # Otherwise you may get "MonkeyPatchWarning: Monkey-patching ssl after ssl has already been imported" and infinite recursion
       # https://github.com/pytest-dev/pytest/issues/6210
-      - run: uv run python -m gevent.monkey --module pytest
-        env:
-          LOCUSTCLOUD_USERNAME: ${{ secrets.LOCUSTCLOUD_USERNAME }}
-          LOCUSTCLOUD_PASSWORD: ${{ secrets.LOCUSTCLOUD_PASSWORD }}
+      # - run: uv run --with locust --with . python -m gevent.monkey --module pytest
+      #   env:
+      #     LOCUSTCLOUD_USERNAME: ${{ secrets.LOCUSTCLOUD_USERNAME }}
+      #     LOCUSTCLOUD_PASSWORD: ${{ secrets.LOCUSTCLOUD_PASSWORD }}
       # any local changes would make hatch-vcs set a "local version" (+dev0...), so we ignore any uv.lock updates:
       - run: git update-index --assume-unchanged uv.lock
       - run: uvx --from build pyproject-build --sdist --wheel --installer uv
@@ -41,7 +41,7 @@ jobs:
           path: dist/*
       # Ensure what customers will actually run does not rely on dev-dependencies
       - run: rm -rf uv.lock .venv
-      - run: uv run --no-default-groups locust-cloud --help
+      - run: uv run --with locust --with . --no-default-groups locust --cloud --help
 
   publish_pypi:
     name: Publish to PyPI

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.23.3.dev3
+Version: 1.23.3.dev10
 Summary: Locust Cloud
 Project-URL: homepage, https://locust.cloud
 Project-URL: repository, https://github.com/locustcloud/locust-cloud

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/locust_cloud/args.py

@@ -288,14 +288,10 @@ Parameters specified on command line override env vars, which in turn override c
     add_config_file_help=False,
     add_env_var_help=False,
 )
+# We do not use this, but we keep it here to consume it from CLI if provided
 combined_cloud_parser.add_argument(
     "-f",
     "--locustfile",
-    metavar="<filename>",
-    default="locustfile.py",
-    help="The Python file that contains your test. Defaults to 'locustfile.py'.",
-    env_var="LOCUST_LOCUSTFILE",
-    type=transfer_encoded_file,
 )
 combined_cloud_parser.add_argument(
     "-u",

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/locust_cloud/cloud.py

@@ -7,7 +7,7 @@ from threading import Thread
 import requests
 from locust_cloud.actions import delete
 from locust_cloud.apisession import ApiSession
-from locust_cloud.args import combined_cloud_parser
+from locust_cloud.args import combined_cloud_parser, transfer_encoded_file
 from locust_cloud.common import __version__
 from locust_cloud.input_events import input_listener
 from locust_cloud.websocket import SessionMismatchError, Websocket, WebsocketTimeout
@@ -27,15 +27,17 @@ def configure_logging(loglevel: str) -> None:
     logging.getLogger("urllib3").setLevel(logging.INFO)
 
 
-def main():
+def main(locustfiles: list[str]):
     options, locust_options = combined_cloud_parser.parse_known_args()
 
     configure_logging(options.loglevel)
 
-    if not options.locustfile:
+    if not locustfiles:
         logger.error("A locustfile is required to run a test.")
         return 1
 
+    s3_locustfiles = [transfer_encoded_file(locustfile) for locustfile in locustfiles]
+
     session = ApiSession(options.non_interactive)
     websocket = Websocket()
 
@@ -67,7 +69,7 @@ def main():
 
         payload = {
             "locust_args": locust_args,
-            "locustfile": options.locustfile,
+            "locustfile": s3_locustfiles,
             "user_count": options.users,
             "mock_server": options.mock_server,
         }

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/tests/args_test.py

@@ -79,17 +79,6 @@ def test_transfer_encoded_args_files():
         assert zf.namelist() == ["testdata/extra-files/extra.txt"]
 
 
-def test_parser_locustfile(capsys):
-    with pytest.raises(SystemExit):
-        combined_cloud_parser.parse_known_args("locust-cloud --locustfile does-not-exist")
-
-    expected = "error: argument -f/--locustfile: File not found: does-not-exist"
-    assert expected in capsys.readouterr().err
-
-    options, _ = combined_cloud_parser.parse_known_args("locust-cloud --locustfile testdata/extra-files/extra.txt")
-    assert options.locustfile == transfer_encoded_file("testdata/extra-files/extra.txt")
-
-
 def test_parser_extra_files(capsys):
     with pytest.raises(SystemExit):
         combined_cloud_parser.parse_known_args("locust-cloud --extra-files ../pineapple")

{locust_cloud-1.23.3.dev3 → locust_cloud-1.23.3.dev10}/tests/cloud_test.py

@@ -70,14 +70,13 @@ def test_cli_auth() -> None:
     }
 
     # Check that we get the message that login is required
-    process = subprocess.Popen(["locust-cloud"], env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    process.wait(timeout=1)
+    process = subprocess.run(["locust", "--cloud"], env=env, capture_output=True, text=True, timeout=1)
     assert process.stdout  # typing, not testing...
-    assert unauthorized_message in process.stdout.read()
+    assert unauthorized_message in process.stdout
 
     # Do a locust-cloud --login
     process = subprocess.Popen(
-        ["locust-cloud", "--login"],
+        ["locust", "--login"],
         env=env,
         stdout=subprocess.PIPE,
         stdin=subprocess.PIPE,