rbx.cp 0.18.0__tar.gz → 0.18.2__tar.gz

{rbx_cp-0.18.0 → rbx_cp-0.18.2}/PKG-INFO

@@ -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 → rbx_cp-0.18.2}/pyproject.toml

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

rbx_cp-0.18.2/rbx/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.18.2'

{rbx_cp-0.18.0 → rbx_cp-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_cp-0.18.0 → rbx_cp-0.18.2}/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_cp-0.18.0 → rbx_cp-0.18.2}/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_cp-0.18.0 → rbx_cp-0.18.2}/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_cp-0.18.0 → rbx_cp-0.18.2}/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_cp-0.18.0 → rbx_cp-0.18.2}/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/rbx/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.18.0'