rbx.cp 0.5.67__py3-none-any.whl → 0.5.69__py3-none-any.whl

rbx/box/solutions.py

@@ -725,26 +725,24 @@ def expand_solutions_with_source(sols: List[str]) -> List[Tuple[Solution, bool]]
     pkg_sols = {str(sol.path): sol for sol in pkg.solutions}
 
     # Download remote sols.
-    sols = remote.expand_files(sols)
+    path_sols = remote.expand_files(sols)
 
     # Ensure sols exist.
-    sols = [sol for sol in sols if pathlib.Path(sol).is_file()]
+    path_sols = [sol for sol in path_sols if sol.is_file()]
 
     seen_sols = set()
     res: List[Tuple[Solution, bool]] = []
-    for sol in sols:
-        if sol in seen_sols:
+    for sol in path_sols:
+        if str(sol) in seen_sols:
             # This solution was already added.
             continue
-        if sol in pkg_sols:
+        if str(sol) in pkg_sols:
             # This solution is in the package.
-            res.append((pkg_sols[sol], False))
+            res.append((pkg_sols[str(sol)], False))
         else:
             # This solution is fetched from some source.
-            res.append(
-                (Solution(path=pathlib.Path(sol), outcome=ExpectedOutcome.ANY), True)
-            )
-        seen_sols.add(sol)
+            res.append((Solution(path=sol, outcome=ExpectedOutcome.ANY), True))
+        seen_sols.add(str(sol))
     return res
 
 

rbx/resources/packagers/boca/compile/java

@@ -115,6 +115,12 @@ if [ -n "$(sed -n -E "/$regex/p" src/$name)" ]; then
   sed -i -E "s/$regex/public class Main\1/" src/Main.java
 fi
 
+echo "Klass is $klass"
+
+cat <<EOF >src/Manifest.txt
+Main-Class: $klass
+EOF
+
 cat <<EOF >compileit.sh
 #!/bin/bash
 javac=$(which javac)
@@ -140,7 +146,7 @@ find . -name "*.java" | while read lin; do
   echo \$? > ../compileit.retcode
 done
 rm -f ../$jarfile
-\$jar cvfe ../$jarfile \$klass *
+\$jar cfm ../$jarfile Manifest.txt *
 exit 0
 EOF
 chmod 755 compileit.sh
@@ -182,6 +188,7 @@ fi
 if [ -f "stderr0" ]; then
   cat "stderr0"
 fi
+
 rm -rf src/
 if [ "$ret" != "0" ]; then
   echo "Compilation Error: $ret"

rbx/resources/packagers/boca/compile/py2

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     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/python2" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"

rbx/resources/packagers/boca/compile/py3

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     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"
 chmod 755 "../$exe"

{rbx_cp-0.5.67.dist-info → rbx_cp-0.5.69.dist-info}/METADATA

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

{rbx_cp-0.5.67.dist-info → rbx_cp-0.5.69.dist-info}/RECORD

@@ -53,7 +53,7 @@ rbx/box/retries.py,sha256=70n2avWa7GYSyNcmhml8qp1K21Fmp-JNjvYC9b_UaNg,4721
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
 rbx/box/schema.py,sha256=bJgO0KV75mGzCXv24jASFvZFP1peM_qP23_H5MpXM5M,16670
 rbx/box/setter_config.py,sha256=9iObg6BwxQhFAhIOk31Jc0BDDpRYVGf3SyLIOsWIltM,4393
-rbx/box/solutions.py,sha256=wxAXSYGZ3VVee5q6syuMd6v57xBji5nJ0H-gUEx_t4s,50918
+rbx/box/solutions.py,sha256=VLd-v8Ns0qgJ0-wMD9AIW0v4Jiw3dvWzpLrhV1u9P1s,50900
 rbx/box/solutions_test.py,sha256=PX1TQoRzNd9mi1SGsG7WFrpqFgNrNX5Kwt0mkwFdoOA,1749
 rbx/box/state.py,sha256=MMf3DvfQji0jKEliCHct2Tpp_0epL1tvP8HbHNArQIc,166
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -144,11 +144,11 @@ rbx/resources/packagers/boca/compare.sh,sha256=a6AmQqwrIq616DHjp_S2l95wO7UiMVy0L
 rbx/resources/packagers/boca/compile/c,sha256=lHLvxzkG_he5jmxWrix0WT80ipMWWUZdOgOQMSpj8oo,4507
 rbx/resources/packagers/boca/compile/cc,sha256=B_18QkUGcjUg6yrTFlTQuMWnHpTWUKPZmFuk7Y0l1VA,4561
 rbx/resources/packagers/boca/compile/cpp,sha256=_1pJTSC7uADu-IIdQCaZyMbH8x01wfgxcdZ36oxXncI,4496
-rbx/resources/packagers/boca/compile/java,sha256=8T5JYBignVPYOUQyjSUb9eVAVe0x9OsLP5HZDL636W4,5178
+rbx/resources/packagers/boca/compile/java,sha256=vh3IeWzvPWrEX0n9AmAHFlpQrq7MX1feLhHfdBP7onU,5259
 rbx/resources/packagers/boca/compile/kt,sha256=3B900QSD4jSXnX91gJbvI4ZmNELHSiBb584Tmx7XtOc,4026
 rbx/resources/packagers/boca/compile/pas,sha256=C5IwZzmZpIos49FrLGafRbdGPODNJn7N5JbnLX_FT_4,4576
-rbx/resources/packagers/boca/compile/py2,sha256=mo-Ar-fzhinDlBOKUQ-0iovKVKX-69obDOe71KIIGTo,4725
-rbx/resources/packagers/boca/compile/py3,sha256=UOXeXKfdoR90wVEWIH9BvETyTOJmSmtpLoR5nJKTeXQ,4725
+rbx/resources/packagers/boca/compile/py2,sha256=UJknN4xiKP8oMN8tRZ92tDlESXgBfRO69QfyUyjijvA,4739
+rbx/resources/packagers/boca/compile/py3,sha256=L5Yzl_G5kTdmx7N7-oW3Dm_sq4uQJleRmFq84WNfZXo,4739
 rbx/resources/packagers/boca/interactive/c,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
 rbx/resources/packagers/boca/interactive/cc,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
 rbx/resources/packagers/boca/interactive/cpp,sha256=BdyAz61YV1ojQGTKOXJXrMfN9zA9r4X3NnCRb4vJIEE,5719
@@ -217,8 +217,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=x_PqD8Zd2PkN91NxVHUnSTs044-1WK5KKtttKQBXpFs,2083
 rbx/utils.py,sha256=SfR844_i0ebRDMkmS_w1YdZiWPc6h2RGADygewlWRbA,4845
-rbx_cp-0.5.67.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.67.dist-info/METADATA,sha256=yhbY-Q4k_VRDdqXvgKqCgBRDhP1XxqXGRKUf4ISG_Jg,3604
-rbx_cp-0.5.67.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.67.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.67.dist-info/RECORD,,
+rbx_cp-0.5.69.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.69.dist-info/METADATA,sha256=YpETtdyFx34gR3mFyvBUAM5Y62bWSbOiKW4FTfEvmT8,3604
+rbx_cp-0.5.69.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.69.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.69.dist-info/RECORD,,