code-battles-cli 1.2.0__tar.gz → 1.2.1__tar.gz

code_battles_cli-1.2.1/.python-version

@@ -0,0 +1 @@
+3.8

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: code-battles-cli
-Version: 1.2.0
+Version: 1.2.1
 Summary: A CLI for competitors in any Code Battles event!
 Requires-Python: >=3.8
 Requires-Dist: click>=8.1.7

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "code-battles-cli"
-version = "1.2.0"
+version = "1.2.1"
 description = "A CLI for competitors in any Code Battles event!"
 dependencies = [
     "requests>=2.32.3",

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/requirements-dev.lock

@@ -18,6 +18,8 @@ charset-normalizer==3.4.0
     # via requests
 click==8.1.7
     # via code-battles-cli
+exceptiongroup==1.3.0
+    # via pytest
 google-api-core==2.21.0
     # via google-cloud-core
     # via google-cloud-firestore
@@ -73,5 +75,10 @@ rich==13.9.3
     # via code-battles-cli
 rsa==4.9
     # via google-auth
+tomli==2.2.1
+    # via pytest
+typing-extensions==4.13.2
+    # via exceptiongroup
+    # via rich
 urllib3==2.2.3
     # via requests

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/requirements.lock

@@ -66,5 +66,7 @@ rich==13.9.3
     # via code-battles-cli
 rsa==4.9
     # via google-auth
+typing-extensions==4.13.2
+    # via rich
 urllib3==2.2.3
     # via requests

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/src/code_battles_cli/api.py

@@ -28,6 +28,18 @@ SIMULATION_FINISHED_MARK = b"--- SIMULATION FINISHED ---"
 SIMULATION_STEP_MARK = b"__CODE_BATTLES_ADVANCE_STEP"
 
 
+def normalize(url: str):
+    if url.startswith("https"):
+        url = url[5:]
+
+    try:
+        url = url[: url.index(".web.app")]
+    except ValueError:
+        pass
+
+    return url
+
+
 class SimulationException(Exception):
     def __init__(self, stderr: bytes, exit_code: int):
         self.stderr = stderr
@@ -213,11 +225,7 @@ class Client:
 
     def _possibly_download(self, force_download=False):
         directory_name = "".join(
-            [
-                c
-                for c in self.url.removeprefix("https").removesuffix(".web.app")
-                if c.isalnum() or c == "-"
-            ]
+            [c for c in normalize(self.url) if c.isalnum() or c == "-"]
         )
         code_directory = os.path.expanduser(f"~/.cache/code-battles/{directory_name}")
 
@@ -242,6 +250,9 @@ class Client:
         on_step: Optional[Callable[[], None]] = None,
     ) -> Union[SimulationResults, str]:
         while True:
+            if p.poll() is not None:
+                raise SimulationException(p.stderr.read(), p.returncode)
+
             line: bytes = p.stdout.readline()
             line = line.strip()
             if line == SIMULATION_FINISHED_MARK:
@@ -310,7 +321,11 @@ class Client:
                 os.path.join(code_directory, "packed.py"),
                 "simulate",
                 str(seed),
-                str(os.path.abspath(output_file)),
+                str(
+                    os.path.abspath(output_file)
+                    if output_file is not None
+                    else output_file
+                ),
                 json.dumps(parameters),
                 "-".join(bot_names),
             ]

{code_battles_cli-1.2.0 → code_battles_cli-1.2.1}/src/code_battles_cli/commands/upload.py

@@ -45,4 +45,5 @@ def upload(
 
     client = Client(url, username, password, dump_credentials)
     client.set_bots({bot_name: bot_code})
-    log.info(f"{bot_code.count('\n') + 1} lines of code were uploaded as '{bot_name}'.")
+    line_count = bot_code.count("\n") + 1
+    log.info(f"{line_count} lines of code were uploaded as '{bot_name}'.")

code_battles_cli-1.2.0/.python-version

@@ -1 +0,0 @@
-3.12.2