rbx.cp 0.5.23__tar.gz → 0.5.24__tar.gz

{rbx_cp-0.5.23 → rbx_cp-0.5.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.23
+Version: 0.5.24
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.23 → rbx_cp-0.5.24}/pyproject.toml

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

{rbx_cp-0.5.23 → rbx_cp-0.5.24}/rbx/box/code.py

@@ -122,11 +122,31 @@ def _add_warning_pragmas(code: str) -> str:
     )
 
 
+def _add_warning_pragmas_around(code: str) -> str:
+    flags = CXX_WARNING_FLAGS.split()
+    pragma_lines = '\n'.join(
+        [
+            f'#pragma GCC diagnostic ignored "{flag}"'
+            for flag in flags
+            if not flag.startswith('-Wno-')
+        ]
+    )
+
+    return (
+        '#pragma GCC diagnostic push\n'
+        + pragma_lines
+        + '\n'
+        + code
+        + '\n'
+        + '#pragma GCC diagnostic pop\n'
+    )
+
+
 def _ignore_warning_in_cxx_input(input: GradingFileInput):
-    if input.src is None or input.src.suffix not in ('.cpp', '.c', '.cc', '.cxx'):
+    if input.src is None or input.src.suffix not in ('.h', '.hpp'):
         return
     preprocessed_path = package.get_problem_preprocessed_path(input.src)
-    preprocessed_path.write_text(_add_warning_pragmas(input.src.read_text()))
+    preprocessed_path.write_text(_add_warning_pragmas_around(input.src.read_text()))
     input.src = preprocessed_path
 
 
@@ -185,9 +205,6 @@ def compile_item(
         GradingFileInput(src=generator_path, dest=PosixPath(file_mapping.compilable))
     )
 
-    for input in artifacts.inputs:
-        _ignore_warning_in_cxx_input(input)
-
     artifacts.outputs.append(
         GradingFileOutput(
             src=PosixPath(file_mapping.executable),
@@ -196,6 +213,9 @@ def compile_item(
         )
     )
 
+    for input in artifacts.inputs:
+        _ignore_warning_in_cxx_input(input)
+
     if not steps_with_caching.compile(
         commands,
         params=sandbox_params,

{rbx_cp-0.5.23 → rbx_cp-0.5.24}/rbx/box/package.py

@@ -163,16 +163,12 @@ def get_problem_preprocessed_path(
 ) -> pathlib.Path:
     root_resolved = root.resolve()
     item_resolved = item.resolve()
+
     if not item_resolved.is_relative_to(root_resolved):
-        console.console.print(
-            f'[error]Item [item]{item}[/item] is not under the root [item]{root}[/item].[/error]'
-        )
-        raise typer.Exit(1)
-    path = (
-        get_problem_cache_dir(root)
-        / '.preprocessed'
-        / item_resolved.relative_to(root_resolved)
-    )
+        final_path = pathlib.Path('remote') / item_resolved.name
+    else:
+        final_path = item_resolved.relative_to(root_resolved)
+    path = get_problem_cache_dir(root) / '.preprocessed' / final_path
     path.parent.mkdir(parents=True, exist_ok=True)
     return path