rbx.cp 0.5.22__py3-none-any.whl → 0.5.24__py3-none-any.whl

rbx/box/code.py

@@ -1,7 +1,6 @@
 import pathlib
 import re
 import shlex
-import tempfile
 from enum import Enum
 from pathlib import PosixPath
 from typing import List, Optional
@@ -123,12 +122,32 @@ 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
-    tmp_path = PosixPath(tempfile.mkstemp()[1])
-    tmp_path.write_text(_add_warning_pragmas(input.src.read_text()))
-    input.src = tmp_path
+    preprocessed_path = package.get_problem_preprocessed_path(input.src)
+    preprocessed_path.write_text(_add_warning_pragmas_around(input.src.read_text()))
+    input.src = preprocessed_path
 
 
 # Compile code item and return its digest in the storage.
@@ -186,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),
@@ -197,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/box/main.py

@@ -3,7 +3,6 @@ from gevent import monkey
 
 monkey.patch_all()
 
-
 import asyncio
 import tempfile
 import shlex

rbx/box/package.py

@@ -158,6 +158,21 @@ def get_problem_iruns_dir(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
     return iruns_dir
 
 
+def get_problem_preprocessed_path(
+    item: pathlib.Path, root: pathlib.Path = pathlib.Path()
+) -> pathlib.Path:
+    root_resolved = root.resolve()
+    item_resolved = item.resolve()
+
+    if not item_resolved.is_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
+
+
 @functools.cache
 def get_cache_storage(root: pathlib.Path = pathlib.Path()) -> Storage:
     return FilesystemStorage(get_problem_storage_dir(root))

{rbx_cp-0.5.22.dist-info → rbx_cp-0.5.24.dist-info}/METADATA

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

{rbx_cp-0.5.22.dist-info → rbx_cp-0.5.24.dist-info}/RECORD

@@ -5,7 +5,7 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=0TiRQJoHqLHAI8QwBrscbaJmhdcmialVtP_oEkfHcs0,3260
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
 rbx/box/checkers.py,sha256=VpgDzevOK7hrffG2zJGxquNiu-a9Fl3wquLn7xadcK0,6285
-rbx/box/code.py,sha256=_g9-BGQdiH0wBIxkzZXj7Hk3O3u7ZqGzPRO88CwOsWo,11064
+rbx/box/code.py,sha256=9VKwvIyQRaoINg1lRzDgJlibDNLdzf5CCPYxsAtYEcU,11528
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,8 +22,8 @@ rbx/box/environment.py,sha256=47NtyuVC6zSQKAtQaXPEXvqcD-KJiuWRpWF8pYvcG4c,11158
 rbx/box/extensions.py,sha256=gIC73VbF1897er3iIMhaIw6GE8o1t43M7q97Iz7-_lg,503
 rbx/box/generators.py,sha256=bzURQrNEscCO8_3BYXCyGK9ZneX4-eOJZP5JJV28f3I,16350
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
-rbx/box/main.py,sha256=QFn19JoxnAerg1u-jpUIkgvu2qscMmJdCHRSGsWkafc,22068
-rbx/box/package.py,sha256=yk5NvHtDk2SnoYgs0zhA0VybZYSrwe7BjSNb7PwgCKY,11334
+rbx/box/main.py,sha256=pc7DiIaPnq50DUPsPhtzr4kiPu5c2TrK0QaS21wcmwY,22067
+rbx/box/package.py,sha256=SSckCXo7Zh412_qjYhSNwConjhR0Sk8911qGJU34Hac,11851
 rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
 rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
 rbx/box/packaging/contest_main.py,sha256=Hbxh7geNqrePs5tWhPgdg5W2qhaW5yoreK_VP0Sm19k,2727
@@ -162,8 +162,8 @@ rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
 rbx/utils.py,sha256=WlmnF4whc0-6ksVZoOhmom2bR2spT6zETFHjnpJOCsA,4383
-rbx_cp-0.5.22.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.22.dist-info/METADATA,sha256=uUIasZQ4aNtfxM9AnnRJe2S_I3Z6kzxT_qtTDQmdVlM,3290
-rbx_cp-0.5.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.22.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.22.dist-info/RECORD,,
+rbx_cp-0.5.24.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.24.dist-info/METADATA,sha256=oIiRQJKg7rlcz6fJfap3_0yZrNT2uWDW1TH8VG33NCY,3290
+rbx_cp-0.5.24.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.24.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.24.dist-info/RECORD,,