rbx.cp 0.11.1__tar.gz → 0.11.2__tar.gz

{rbx_cp-0.11.1 → rbx_cp-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.11.1
+Version: 0.11.2
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0

{rbx_cp-0.11.1 → rbx_cp-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.11.1"
+version = "0.11.2"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.11.1 → rbx_cp-0.11.2}/rbx/box/contest/build_contest_statements.py

@@ -1,5 +1,6 @@
 import dataclasses
 import pathlib
+import subprocess
 import tempfile
 import typing
 from typing import Any, Dict, List, Optional, Tuple
@@ -211,8 +212,12 @@ def build_contest_only(
     input_type: StatementType,
     output_type: Optional[StatementType] = None,
     custom_vars: Optional[Dict[str, Any]] = None,
+    install_tex: bool = False,
 ) -> Tuple[bytes, StatementType]:
     console.console.print('Building contest-level statement.')
+    if install_tex:
+        output_type = StatementType.TeX
+
     bdrs = get_builders(
         contest.name,
         statement.steps,
@@ -243,6 +248,15 @@ def build_contest_only(
                 item=get_statement_builder_contest(statement, extracted_problems),
                 verbose=False,
             )
+
+            if install_tex and bdr.output_type() == StatementType.TeX:
+                console.console.log(
+                    f'Installing LaTeX packages for [item]{statement.name} {statement.language}[/item]...'
+                )
+                subprocess.run(
+                    ['texliveonfly', output],
+                    cwd=td,
+                )
         last_content = output
         last_output = bdr.output_type()
 
@@ -256,6 +270,7 @@ def build_statement_rooted(
     output_type: Optional[StatementType] = None,
     use_samples: bool = True,
     custom_vars: Optional[Dict[str, Any]] = None,
+    install_tex: bool = False,
 ) -> Tuple[bytes, StatementType]:
     # Validate.
     if not statement.path.is_file():
@@ -290,9 +305,10 @@ def build_statement_rooted(
         statement.type,
         output_type=joiner.joined_type() if joiner is not None else output_type,
         custom_vars=custom_vars,
+        install_tex=install_tex,
     )
 
-    if joiner is None or joiner.joined_type() == output_type:
+    if joiner is None or install_tex:
         return last_content, last_output
     assert statement.joiner is not None
 
@@ -335,6 +351,7 @@ def build_statement(
     output_type: Optional[StatementType] = None,
     use_samples: bool = True,
     custom_vars: Optional[Dict[str, Any]] = None,
+    install_tex: bool = False,
 ) -> pathlib.Path:
     with tempfile.TemporaryDirectory() as td:
         root = pathlib.Path(td)
@@ -345,6 +362,7 @@ def build_statement(
             output_type=output_type,
             use_samples=use_samples,
             custom_vars=custom_vars,
+            install_tex=install_tex,
         )
 
     statement_path = (pathlib.Path('build') / statement.name).with_suffix(

{rbx_cp-0.11.1 → rbx_cp-0.11.2}/rbx/box/contest/statements.py

@@ -1,4 +1,3 @@
-import subprocess
 from typing import Annotated, List, Optional
 
 import syncer
@@ -102,9 +101,6 @@ async def build(
 
     built_statements = []
 
-    if install_tex:
-        output = StatementType.TeX
-
     for statement in valid_statements:
         built_statements.append(
             build_statement(
@@ -112,23 +108,13 @@ async def build(
                 contest,
                 output_type=output,
                 use_samples=samples,
+                install_tex=install_tex,
                 custom_vars=expand_any_vars(annotations.parse_dictionary_items(vars)),
             )
         )
 
     console.console.rule(title='Built statements')
     for statement, built_path in zip(valid_statements, built_statements):
-        if install_tex:
-            subprocess.run(
-                [
-                    'texliveonfly',
-                    built_path,
-                ]
-            )
-            console.console.log(
-                f'Installing LaTeX packages for [item]{statement.name} {statement.language}[/item]...'
-            )
-            continue
         console.console.print(
             f'[item]{statement.name} {statement.language}[/item] -> {href(built_path)}'
         )