rbx.cp 0.18.6__py3-none-any.whl → 0.18.7__py3-none-any.whl

rbx/__version__.py

@@ -1 +1 @@
-__version__ = '0.18.6'
+__version__ = '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/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/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/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/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/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/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.dist-info → rbx_cp-0.18.7.dist-info}/METADATA

@@ -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.dist-info → rbx_cp-0.18.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rbx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/__version__.py,sha256=P-caO5cD30pqZNyLpkN2n7yzwCR7fGNjSt6QTn-McBw,23
+rbx/__version__.py,sha256=qaYY8qv6Ka6QOPoFsiueJifbAUMhCN9WXKsKD8DV6NU,23
 rbx/annotations.py,sha256=_TkLhgZWiUyon3bonHwUo03ls1jY8LwgcR4bVgtgnc0,3519
 rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,8 +40,8 @@ rbx/box/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 rbx/box/packaging/boca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/packaging/boca/boca_language_utils.py,sha256=aLL58PLso1zdWuYBvTsFMT_IuJOHtTYe2CYtDQApey8,1300
 rbx/box/packaging/boca/boca_outcome_utils.py,sha256=MhO7aKTJ1weCgSJBA9MF_ejK3HFBFwC5dIsiR4wA1Mw,310
-rbx/box/packaging/boca/extension.py,sha256=EQALNEOv4zVDXSKs_dk11n92y7cBZVn8TogIK683lE0,890
-rbx/box/packaging/boca/packager.py,sha256=8dTGP6RMaWqd3a_3Tl2tEW-OuDgktXYsO8qoSuHHkPY,13909
+rbx/box/packaging/boca/extension.py,sha256=iKEKK9cLL8pScsHbh3vlDz1eIxVl9_HHeqrK2lbWO64,916
+rbx/box/packaging/boca/packager.py,sha256=TXqBvbahDrCfkRSib7IEMBiwOwYqn2zBP5LbFA5c3sM,13975
 rbx/box/packaging/contest_main.py,sha256=G3CO4RILxGbUhyLsTdeDqPXEJ3sK2pSH9X8piqU61FQ,4486
 rbx/box/packaging/importer.py,sha256=qcKpDQyf6EvYXorofLs5abteBEWV9AezA8tcihCw5wk,909
 rbx/box/packaging/main.py,sha256=GRTP7_Ao-8I5F0GrLTAXSOwYbh1DYP_cLPm5jUMKN0U,2782
@@ -155,15 +155,15 @@ rbx/resources/packagers/boca/compile/cc,sha256=jxPjE9UDspBcEJV4kG7wkYbiadXCBePiM
 rbx/resources/packagers/boca/compile/cpp,sha256=Fla9Ld6niiZT-0tRiekb2PS18dB2k0e8QmRFepMASag,4452
 rbx/resources/packagers/boca/compile/java,sha256=UrgpcwCtrJsMAEF0B7gDRl2VCZgtBocassleN3Jxw7o,5192
 rbx/resources/packagers/boca/compile/kt,sha256=bE9dhp2vEJjgGobOHOfbQyBQIR7fzSuWnwP2QuwTRhY,3894
-rbx/resources/packagers/boca/compile/py2,sha256=eFJIzpRuE7XtI1CzE44njnRUU7tQNgK_wNbIslh9I0Q,4695
-rbx/resources/packagers/boca/compile/py3,sha256=HWA_yQ6B8VQ_WYVRZWPclbxv7BRiEJTTc9H9oWl1bGU,4695
+rbx/resources/packagers/boca/compile/py2,sha256=52My1b5Dgveb7h7U93gPSs71yjc3bEj6hzpUDa-1whk,4683
+rbx/resources/packagers/boca/compile/py3,sha256=xXCO8Um_8klf97UxEFGsi-ZlUsYir3RTIpWrKsxTAZg,4701
 rbx/resources/packagers/boca/interactive/c,sha256=HVEyQ4uHyqkuzopWvOKtju1J45sulgC-zNioJg-_mgE,4856
 rbx/resources/packagers/boca/interactive/cc,sha256=HVEyQ4uHyqkuzopWvOKtju1J45sulgC-zNioJg-_mgE,4856
 rbx/resources/packagers/boca/interactive/cpp,sha256=HVEyQ4uHyqkuzopWvOKtju1J45sulgC-zNioJg-_mgE,4856
 rbx/resources/packagers/boca/interactive/java,sha256=NgtrKg5sTFQO589QTfEVSYYQOMsKTn7RQ2A4lCxBnFc,5595
 rbx/resources/packagers/boca/interactive/kt,sha256=EQ7oygjq5-zhLdLOAm2Vo9Wj0vxokDUz5SNIOWchiyw,5601
 rbx/resources/packagers/boca/interactive/py2,sha256=A-4GgaIFvt3-8c8MeYzeT19I4MztAY6uyy3VDnaOyII,4829
-rbx/resources/packagers/boca/interactive/py3,sha256=1Kgj-zy4e8hk1583wNZUxnCBvmfyCkPDV9WMhyshyLw,4829
+rbx/resources/packagers/boca/interactive/py3,sha256=i3GxHdxTdEkSM8xEOPiAHLjF1oq1X6jrFoCzpzRr0E4,4843
 rbx/resources/packagers/boca/interactor_compile.sh,sha256=ZsUjQAtLSSwfZsYEs200lSdSrRbGrEFgAmRBmLOzI48,1161
 rbx/resources/packagers/boca/interactor_run.sh,sha256=_hNr_0BIBNy0sedmx21xVKoYF6tJBfI316MfDqsMtqw,4246
 rbx/resources/packagers/boca/run/bkp,sha256=xyDkZDaxgUrW-K2I0YJs8a8dJMuF-k8_ganDGxqhvUQ,4218
@@ -173,7 +173,7 @@ rbx/resources/packagers/boca/run/cpp,sha256=bhB-I-mJ4xNa6lr0OwC1O-eiMVTE_bdAd13n
 rbx/resources/packagers/boca/run/java,sha256=rAcvpriBr3NAuzzjMzIrtTBTgD9dLVr49dW2P7LmYNc,5578
 rbx/resources/packagers/boca/run/kt,sha256=zzCffAP9Rtuv_qqiPYUkmRYOg6MsNXQCdVZMPD4VZc4,5584
 rbx/resources/packagers/boca/run/py2,sha256=2IobOou2k6oYIa_mw0DjeZaqJgw9ZQc69e6XYnRS-fo,4917
-rbx/resources/packagers/boca/run/py3,sha256=_w9IBoDhAThrABcvWfZQ0wOaqnzeiqwG5AL-eAQrVSU,4917
+rbx/resources/packagers/boca/run/py3,sha256=uflJvpZgBYIgqs-Egw5YVAgdvjfRZU20RkoFy35V2Y0,4945
 rbx/resources/packagers/boca/safeexec.c,sha256=HcZyfnCoIRY8Q7HjT6ohUdNBcP4h6jd5A4uoXXNPzYw,17377
 rbx/resources/packagers/boca/safeexec_compile.sh,sha256=MX_lRM2wnBh9MyXRRMcnZlqlnB41BuIbGXrwXkBPM1s,1094
 rbx/resources/packagers/moj/scripts/c/compile.sh,sha256=d6IFuVf_EmUhkHg5urrv3G4e8AFFYgHqEYJ_ROs-A-M,231
@@ -201,7 +201,7 @@ rbx/resources/presets/default/contest/statement/info.rbx.tex,sha256=Wz8Tbmi2lPWM
 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=9MaKkSc289LrwATbMgIEFpuUayrJwdFBSw4rWY1TS0c,2098
-rbx/resources/presets/default/preset.rbx.yml,sha256=F9aJMGN017A4McIyFXRG9Dd2MbEu8X4lDBduKjsATw4,520
+rbx/resources/presets/default/preset.rbx.yml,sha256=3lQuVglpQkWMXC1AQpES7SyR4Rx4l5XnSnN9tYOgDVs,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
@@ -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.6.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.18.6.dist-info/METADATA,sha256=Gw7GmIC2L4JUCDA3GMUKw2WisXeQuXItU1JCZX05y-s,4845
-rbx_cp-0.18.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.18.6.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
-rbx_cp-0.18.6.dist-info/RECORD,,
+rbx_cp-0.18.7.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.18.7.dist-info/METADATA,sha256=auvEkSzv7S77DlWnUcg_5JrCg3Caf0IM7SGRhI1zCPI,4845
+rbx_cp-0.18.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.18.7.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
+rbx_cp-0.18.7.dist-info/RECORD,,