rbx.cp 0.18.6__tar.gz → 0.18.7__tar.gz

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/PKG-INFO

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

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/pyproject.toml

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

rbx_cp-0.18.7/rbx/__version__.py

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

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/box/packaging/boca/extension.py

@@ -12,6 +12,7 @@ class BocaExtension(BaseModel):
     flags: typing.Dict[BocaLanguage, str] = {}
     maximumTimeError: float = _MAX_REP_ERROR
     preferContestLetter: bool = False
+    usePypy: bool = False
 
     def flags_with_defaults(self) -> typing.Dict[BocaLanguage, str]:
         res: typing.Dict[BocaLanguage, str] = {

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/box/packaging/boca/packager.py

@@ -149,9 +149,16 @@ class BocaPackager(BasePackager):
             raise typer.Exit(1)
         return compare_path.read_text()
 
-    def _get_checker(self) -> str:
+    def _replace_common(self, text: str, lang: str) -> str:
         extension = get_extension_or_default('boca', BocaExtension)
+        flags = extension.flags_with_defaults()
+        if lang in flags:
+            text = text.replace('{{rbxFlags}}', flags[lang])
+        return text.replace(
+            '{{rbxPython3}}', 'pypy3' if extension.usePypy else 'python3'
+        )
 
+    def _get_checker(self) -> str:
         checker_path = get_default_app_path() / 'packagers' / 'boca' / 'checker.sh'
         if not checker_path.exists():
             console.console.print(
@@ -163,15 +170,13 @@ class BocaPackager(BasePackager):
         checker = package.get_checker().path.read_text()
         rbx_header = header.get_header().read_text()
         return (
-            checker_text.replace('{{rbxFlags}}', extension.flags_with_defaults()['cc'])
+            self._replace_common(checker_text, 'cc')
             .replace('{{testlib_content}}', testlib)
             .replace('{{rbx_header_content}}', rbx_header)
             .replace('{{checker_content}}', checker)
         )
 
     def _get_interactor(self) -> str:
-        extension = get_extension_or_default('boca', BocaExtension)
-
         interactor_path = (
             get_default_app_path() / 'packagers' / 'boca' / 'interactor_compile.sh'
         )
@@ -183,9 +188,9 @@ class BocaPackager(BasePackager):
 
         interactor_text = interactor_path.read_text()
         interactor = package.get_interactor().path.read_text()
-        return interactor_text.replace(
-            '{{rbxFlags}}', extension.flags_with_defaults()['cc']
-        ).replace('{{interactor_content}}', interactor)
+        return self._replace_common(interactor_text, 'cc').replace(
+            '{{interactor_content}}', interactor
+        )
 
     def _get_safeexec(self) -> str:
         safeexec_script_path = (
@@ -208,7 +213,6 @@ class BocaPackager(BasePackager):
 
     def _get_compile(self, language: BocaLanguage) -> str:
         pkg = package.find_problem_package_or_die()
-        extension = get_extension_or_default('boca', BocaExtension)
 
         compile_path = (
             get_default_app_path() / 'packagers' / 'boca' / 'compile' / language
@@ -233,9 +237,7 @@ class BocaPackager(BasePackager):
             'umask 0022', 'umask 0022\n\n' + self._get_checker()
         )
 
-        flags = extension.flags_with_defaults()
-        if language in flags:
-            compile_text = compile_text.replace('{{rbxFlags}}', flags[language])
+        compile_text = self._replace_common(compile_text, language)
         return compile_text
 
     def _copy_solutions(self, into_path: pathlib.Path):
@@ -250,18 +252,17 @@ class BocaPackager(BasePackager):
             dest_path.parent.mkdir(parents=True, exist_ok=True)
             shutil.copy(str(solution.path), dest_path)
 
-    def _expand_run_script(self, run_path: pathlib.Path):
+    def _expand_run_script(self, run_path: pathlib.Path, language: BocaLanguage):
         pkg = package.find_problem_package_or_die()
+        content = run_path.read_text()
         if pkg.type == TaskType.COMMUNICATION:
             runit_content = (
                 get_default_app_path() / 'packagers' / 'boca' / 'interactor_run.sh'
             ).read_text()
-            run_path.write_text(
-                run_path.read_text().replace(
-                    '{{runit_content}}',
-                    runit_content,
-                )
-            )
+            content = content.replace('{{runit_content}}', runit_content)
+
+        content = self._replace_common(content, language)
+        run_path.write_text(content)
 
     @classmethod
     def name(cls) -> str:
@@ -308,7 +309,7 @@ class BocaPackager(BasePackager):
                 )
                 raise typer.Exit(1)
             shutil.copyfile(run_orig_path, run_path / language)
-            self._expand_run_script(run_path / language)
+            self._expand_run_script(run_path / language, language)
 
         # Prepare compile.
         compile_path = into_path / 'compile'

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/resources/packagers/boca/compile/py2

@@ -119,7 +119,7 @@ cd src
 #     exit 0
 # fi
 
-echo "#!/usr/bin/python2" | cat - "$name" > "../$exe"
+echo "#!\$cc" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"
 echo \$? > ../compileit.retcode
 exit 0

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/resources/packagers/boca/compile/py3

@@ -101,25 +101,27 @@ else
   exe=$2
 fi
 
+chmod -R 775 src
+
 rm -f "$exe" compileit.retcode runit.retcode 2>/dev/null
 cat <<EOF >compileit.sh
 #!/bin/bash
-cc=\`which python3\`
-[ -x "\$cc" ] || cc=/usr/bin/python3
+cc=\`which {{rbxPython3}}\`
+[ -x "\$cc" ] || cc=/usr/bin/{{rbxPython3}}
 if [ ! -x "\$cc" ]; then
     echo "\$cc not found or it's not executable"
     exit 47
 fi
 cd src
-# "\$cc" -m py_compile "$name"
-# pyc_ret=\$?
-# if [ "\$pyc_ret" != "0" ]; then
-#     echo "python syntax check failed: \$pyc_ret"
-#     echo \$pyc_ret > ../compileit.retcode
-#     exit 0
-# fi
+"\$cc" -m py_compile "$name"
+pyc_ret=\$?
+if [ "\$pyc_ret" != "0" ]; then
+    echo "python syntax check failed: \$pyc_ret"
+    echo \$pyc_ret > ../compileit.retcode
+    exit 0
+fi
 
-echo "#!/usr/bin/python3" | cat - "$name" > "../$exe"
+echo "#!\$cc" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"
 echo \$? > ../compileit.retcode
 exit 0

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/resources/packagers/boca/interactive/py3

@@ -130,8 +130,8 @@ if [ $? -eq 0 ]; then
   cd "$cdir"
   [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc
   [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys
-  python3=$(which python3)
-  [ -x "\$python3" ] || python3=/usr/bin/python3
+  python3=$(which {{rbxPython3}})
+  [ -x "\$python3" ] || python3=/usr/bin/{{rbxPython3}}
   if [ ! -x "\$python3" ]; then
       echo "\$python3 not found or it's not executable"
       exit 47

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/rbx/resources/packagers/boca/run/py3

@@ -119,8 +119,8 @@ cd "$cdir"
 [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc
 #/bin/mount --bind /dev /dev
 [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys
-python3=$(which python3)
-[ -x "\$python3" ] || python3=/usr/bin/python3
+python3=$(which {{rbxPython3}})
+[ -x "\$python3" ] || python3=/usr/bin/{{rbxPython3}}
 if [ ! -x "\$python3" ]; then
     echo "\$python3 not found or it's not executable"
     exit 47
@@ -147,8 +147,8 @@ else
   echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2
   echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2
   echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2
-  python3=$(which python3)
-  [ -x "$python3" ] || python3=/usr/bin/python3
+  python3=$(which {{rbxPython3}})
+  [ -x "$python3" ] || python3=/usr/bin/{{rbxPython3}}
   if [ ! -x "$python3" ]; then
     echo "$python3 not found or it's not executable"
     exit 47

{rbx_cp-0.18.6 → rbx_cp-0.18.7}/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.6"
+min_version: "0.18.7"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

rbx_cp-0.18.6/rbx/__version__.py

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