rbx.cp 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

rbx/__version__.py

@@ -1 +1 @@
-__version__ = '0.18.0'
+__version__ = '0.18.2'

rbx/box/contest/build_contest_statements.py

@@ -126,8 +126,6 @@ def get_problems_for_statement(
         raise typer.Exit(1)
 
     def matches(statement: Statement) -> bool:
-        if not requires_matching_statement:
-            return True
         if contest_statement.match is None:
             return statement.language == contest_statement.language
         return statement.name == contest_statement.match
@@ -137,6 +135,8 @@ def get_problems_for_statement(
         matching_statements = [
             statement for statement in pkg.expanded_statements if matches(statement)
         ]
+        if not matching_statements and requires_matching_statement:
+            matching_statements = pkg.expanded_statements
         if not matching_statements:
             console.console.print(
                 f'[error]No statement found for language {contest_statement.language} in problem {problem.short_name}[/error]'
@@ -188,7 +188,9 @@ def _build_problem_statements(
     custom_vars: Optional[Dict[str, Any]] = None,
 ) -> List[ExtractedProblem]:
     console.console.print('Building problem-level statements...')
-    extracted_problems = get_problems_for_statement(contest, statement)
+    extracted_problems = get_problems_for_statement(
+        contest, statement, requires_matching_statement=True
+    )
     res = []
     contest_cwd_absolute = utils.abspath(pathlib.Path())
     contest_assets = get_relative_assets(statement.path, statement.assets)

rbx/box/environment.py

@@ -303,10 +303,17 @@ def get_language(name: str) -> EnvironmentLanguage:
 
 
 @functools.cache
-def get_language_by_extension(extension: str) -> EnvironmentLanguage:
+def get_language_by_extension_or_nil(extension: str) -> Optional[EnvironmentLanguage]:
     for lang in get_environment().languages:
         if lang.extension == extension:
             return lang
+    return None
+
+
+def get_language_by_extension(extension: str) -> EnvironmentLanguage:
+    lang = get_language_by_extension_or_nil(extension)
+    if lang is not None:
+        return lang
     console.console.print(
         f'Language with extension [item]{extension}[/item] not found.', style='error'
     )

rbx/box/package.py

@@ -10,7 +10,7 @@ from pydantic import ValidationError
 
 from rbx import console, utils
 from rbx.box import cd, global_package
-from rbx.box.environment import get_sandbox_type
+from rbx.box.environment import get_language_by_extension, get_sandbox_type
 from rbx.box.global_package import get_cache_fingerprint
 from rbx.box.sanitizers import issue_stack
 from rbx.box.schema import (
@@ -354,11 +354,15 @@ def get_solutions(root: pathlib.Path = pathlib.Path()) -> List[Solution]:
         if '*' in str(entry.path):
             for file in sorted(root.glob(str(entry.path))):
                 relative_file = file.relative_to(root)
-                add_solution(
-                    Solution.model_copy(
-                        entry, update={'path': relative_file}, deep=True
+                if (
+                    entry.language is not None
+                    or get_language_by_extension(relative_file.suffix) is not None
+                ):
+                    add_solution(
+                        Solution.model_copy(
+                            entry, update={'path': relative_file}, deep=True
+                        )
                     )
-                )
             continue
         add_solution(entry)
     return res

rbx/resources/presets/default/env.rbx.yml

@@ -73,5 +73,5 @@ extensions:
     languages: ["c", "cpp", "java", "py3", "kt"]
     flags:
       c: "-O2 -lm -static"
-      cc: "-std=c++20 -O2 -lm -static"
+      cpp: "-std=c++20 -O2 -lm -static"
     preferContestLetter: true

rbx/resources/presets/default/preset.rbx.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://rsalesc.github.io/rbx/schemas/Preset.json
 name: "default"
-min_version: "0.18.0"
+min_version: "0.18.2"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

rbx/resources/presets/default/problem/problem.rbx.yml

@@ -17,19 +17,19 @@ testcases:
     generatorScript:
       path: "testplan/random.py" # Generator script written programatically.
 solutions:
-  - path: "sols/main.cpp"
+  - path: "sols/main*.*"
     outcome: "ACCEPTED"
-  - path: "sols/ac-*.cpp"
+  - path: "sols/ac-*.*"
     outcome: "ACCEPTED"
-  - path: "sols/wa-*.cpp"
+  - path: "sols/wa-*.*"
     outcome: "WRONG_ANSWER"
-  - path: "sols/tle-*.cpp"
+  - path: "sols/tle-*.*"
     outcome: "TIME_LIMIT_EXCEEDED"
-  - path: "sols/mle-*.cpp"
+  - path: "sols/mle-*.*"
     outcome: "MEMORY_LIMIT_EXCEEDED"
-  - path: "sols/re-*.cpp"
+  - path: "sols/re-*.*"
     outcome: "RUNTIME_ERROR"
-  - path: "sols/fail-*.cpp"
+  - path: "sols/fail-*.*"
     outcome: "INCORRECT"
 statements:
   - name: "statement-en"

{rbx_cp-0.18.0.dist-info → rbx_cp-0.18.2.dist-info}/METADATA

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

{rbx_cp-0.18.0.dist-info → rbx_cp-0.18.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rbx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/__version__.py,sha256=xLQqGjpDoJw8wh7LhnSmkR_X41AAFaOxbyFZXuEbtfY,23
+rbx/__version__.py,sha256=J_sFuASI-Iw2fcvpgE7ZSHMQFzk4HFwvMA1XLThcK0w,23
 rbx/annotations.py,sha256=_TkLhgZWiUyon3bonHwUo03ls1jY8LwgcR4bVgtgnc0,3519
 rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,7 +10,7 @@ rbx/box/cli.py,sha256=iNabTCnSf7qhOJAGxUrgWTrPov6xWwq6soMOSoUb9WI,30129
 rbx/box/code.py,sha256=iSHIg9wJ2jC7zVOu2l21TcVUip13t_qsgbqwzMNKTRw,25857
 rbx/box/compile.py,sha256=Kzn5mEQu4vb91W9vjyt0DS6cfPJzFLTUoowFj7uHLUo,2539
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/contest/build_contest_statements.py,sha256=y-jODWc5ANm5uhj2kTHxyYnEOr4CzpxynJFvFjClTso,14734
+rbx/box/contest/build_contest_statements.py,sha256=UW-Ta-1pTUbMqgy9Drrn4eJj3wdg-KBoqUr1hgaPOrY,14840
 rbx/box/contest/contest_package.py,sha256=d7PoUHIWVtqaRGatYOfRvZbQ-bz4MPGmv-H94Eg1yyQ,3289
 rbx/box/contest/contest_utils.py,sha256=fsWHG1e65wq9zvRY3tdf32VF0nU1yzGTOBX5yjXiNk4,1102
 rbx/box/contest/main.py,sha256=-aBmlwbEbGMHxWlF7ulIAeKLy2v7VVsvpb4c-kkqKK8,8564
@@ -20,7 +20,7 @@ rbx/box/creation.py,sha256=oTAC11XV2Pw2YAlF_d11Eo7A1fD6ItlpFMpLEzMLyFI,1331
 rbx/box/deferred.py,sha256=II3X9e87JCOZtmspnHh-n4PFqh-FsH_oc0XJHZ9ZYVQ,691
 rbx/box/download.py,sha256=tLW5gLVeLk0gHMEMwScSoHIXQPkXuPsqXzItsrsnUZY,3070
 rbx/box/dump_schemas.py,sha256=HXJ195h4e017DpfoFfW3MRDukON2ZhcKtJjkRPX-dX4,649
-rbx/box/environment.py,sha256=RBxFrcsjiMh80B6Pv21n047Yl96Vegwgo3HtPA-3QAE,14358
+rbx/box/environment.py,sha256=RkIIVvn1lyx8WJJ7iBwrv4KeUcWThCka2JCs2RxEolU,14563
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/fields.py,sha256=Gsox7Q1M7I8I2FtKvwiAfYUC6USpwghk8fel2Q9Eyhg,2291
 rbx/box/formatting.py,sha256=i3vXHpo_L_VpVPxOe4wHlai1WhlDJlfxUexS9DC0Szg,1249
@@ -34,7 +34,7 @@ rbx/box/limits_info.py,sha256=NTtcZTlDzemOtQQXbNbLORpl3RM9nYHc2-cGMnGYfF8,5370
 rbx/box/linting.py,sha256=wRE0hKCduTBHZYBFmmis_d9AMTsDu0Q-AjByCeTnkrY,3187
 rbx/box/main.py,sha256=a8CYi77kOywPFly4-ucEIJLXQW-1NFp91kK2fA42YTE,86
 rbx/box/naming.py,sha256=M6aYLIge8PHhIuCX50rwGe5VRzgUL--2BVtymIqeeXs,2389
-rbx/box/package.py,sha256=cNOvwE5_hedUFc9c2oHSCW0cj7qkxWXhEpqqhCbwUAc,15390
+rbx/box/package.py,sha256=4nbRh1GtTN0SNkPpwJjpl1ngRRtNYudRmYDeFJdamwU,15607
 rbx/box/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/packaging/boca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/packaging/boca/boca_language_utils.py,sha256=bd5-KxN-0h6yg74Jx3NUsgwf_euBU95zC2GLw0MAFS4,1071
@@ -200,13 +200,13 @@ rbx/resources/presets/default/contest/statement/contest.rbx.tex,sha256=Jx6op_WdV
 rbx/resources/presets/default/contest/statement/info.rbx.tex,sha256=Wz8Tbmi2lPWMgDbJsJolUi1xaQMwSnHmpZ3JwAy_Tb0,998
 rbx/resources/presets/default/contest/statement/instructions.tex,sha256=JG_eR13ukZgEahrrmrbg40H8cUzpoUE8QLocihN-fZ8,2414
 rbx/resources/presets/default/contest/statement/logo.png,sha256=RLNYmZoc-BR6AZKkmr4UEg3h01YeFzvy604jMAQC7aA,414485
-rbx/resources/presets/default/env.rbx.yml,sha256=af11icSgwlw80ouYpY_2Eb5N1D4J-v1QKLeIes5Bi94,2008
-rbx/resources/presets/default/preset.rbx.yml,sha256=rCfxycXQh_OP-n5IeAwtPPIaCbDQVDh7etCX_LRkoUs,520
+rbx/resources/presets/default/env.rbx.yml,sha256=TdPa9Q6WHx0nyHTSZmsj55KCt9r--3vOnayxXVh_p8w,2009
+rbx/resources/presets/default/preset.rbx.yml,sha256=Rilq-8jBNB4cwstp4Y6Rgjpqo9s6oVkz1wjBSyhfuzQ,520
 rbx/resources/presets/default/problem/.gitignore,sha256=1rt95y9Q7ZHIQn28JyZQUdD5zkpRosjAl9ZqoQmX2cE,149
 rbx/resources/presets/default/problem/gens/gen.cpp,sha256=rn6sGRjZ1sFE1Rq02r6488iquY9xTrutcvLv4d1sohA,178
 rbx/resources/presets/default/problem/manual_tests/samples/000.in,sha256=w66OEtCJGqjUNj8cJrqgImgGVm8W_OlIUtF255ds-ow,4
 rbx/resources/presets/default/problem/manual_tests/samples/001.in,sha256=P4QInDX87xXoDWu4PVIzUeNW5LtTlUKbMCvJ9uZOPGw,20
-rbx/resources/presets/default/problem/problem.rbx.yml,sha256=DkGgyy7bAjR8ZPlKjXmF3POv_m9MR3qUqd7WzE88GUI,2218
+rbx/resources/presets/default/problem/problem.rbx.yml,sha256=f7_PgPWvT0_7TZGPQsMhtzSXo_-iWN-uQQNk6dv1xuU,2205
 rbx/resources/presets/default/problem/rbx.h,sha256=iMNSI9tKGK8KJkl0Cgw1jhGdlRjqN_frFs-MFFS5Oq8,3760
 rbx/resources/presets/default/problem/sols/main.cpp,sha256=AW-j65DiFYUN18rddTKCWc_VyYCMgCbjZ0jAJ-0JLuA,124
 rbx/resources/presets/default/problem/sols/wa-overflow.cpp,sha256=Bj7tejPIlXG_JqUHWY1zi9TDbHdRZzgT_JDbCLRdhbQ,136
@@ -223,8 +223,8 @@ rbx/resources/templates/rbx.h,sha256=0AZds9R0PmuPgnlTENb33Y81LW0LlnmOJFaoN8oG3Yo
 rbx/resources/templates/template.cpp,sha256=xXWpWo7fa7HfmPNqkmHcmv3i46Wm0ZL-gPmkRfGvLn4,317
 rbx/testing_utils.py,sha256=vNNdaytowJfuopszVHeFzVtHWlPfipPW4zpqCOvdZKU,2908
 rbx/utils.py,sha256=zOXjEkEN9tlzLliWpssNTSmcvdgveUWDdo427qI3dhM,12225
-rbx_cp-0.18.0.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.18.0.dist-info/METADATA,sha256=itkRm5zzQRfPUlqGXoyyAZWBgE1pYhlZUSZ_mej1WW8,4845
-rbx_cp-0.18.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.18.0.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
-rbx_cp-0.18.0.dist-info/RECORD,,
+rbx_cp-0.18.2.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.18.2.dist-info/METADATA,sha256=A3UeZg7n8qgSsohWCVcMw461cAdkR-wIvkuTixkwri4,4845
+rbx_cp-0.18.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+rbx_cp-0.18.2.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
+rbx_cp-0.18.2.dist-info/RECORD,,

{rbx_cp-0.18.0.dist-info → rbx_cp-0.18.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any