rbx.cp 0.16.0__tar.gz → 0.16.2__tar.gz

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/PKG-INFO

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

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.16.0"
+version = "0.16.2"
 description = ""
 packages = [
   {include = "rbx"}
@@ -86,7 +86,7 @@ major_version_zero = true
 annotated_tag = true
 version_files = [
   "rbx/__version__.py",
-  "rbx/resources/presets/default/preset.rbx.yml:^version",
+  "rbx/resources/presets/default/preset.rbx.yml:^min_version",
 ]
 
 [build-system]

rbx_cp-0.16.2/rbx/__version__.py

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

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/rbx/box/git_utils.py

@@ -48,9 +48,33 @@ def ls_remote_tags(uri: str) -> List[str]:
     ]
 
 
-def latest_remote_tag(uri: str) -> str:
+def ls_version_remote_tags(uri: str) -> List[str]:
     tags = ls_remote_tags(uri)
     valid_tags = [tag for tag in tags if semver.Version.is_valid(tag)]
-    if not valid_tags:
+    return valid_tags
+
+
+def latest_remote_tag(
+    uri: str, before: Optional[str] = None, after: Optional[str] = None
+) -> str:
+    tags = ls_version_remote_tags(uri)
+    if not tags:
         raise ValueError(f'No valid tags found for {uri}')
-    return sorted(valid_tags, key=semver.VersionInfo.parse)[-1]
+    if before is not None:
+        tags = [
+            tag
+            for tag in tags
+            if semver.VersionInfo.parse(tag) <= semver.VersionInfo.parse(before)
+        ]
+    if after is not None:
+        tags = [
+            tag
+            for tag in tags
+            if semver.VersionInfo.parse(tag) >= semver.VersionInfo.parse(after)
+        ]
+    return sorted(tags, key=semver.VersionInfo.parse)[-1]
+
+
+def has_remote_tag(uri: str, tag: str) -> bool:
+    tags = ls_remote_tags(uri)
+    return tag in tags

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/rbx/box/packaging/polygon/xml_schema.py

@@ -27,12 +27,14 @@ class File(BaseXmlModel):
 
 
 class Test(BaseXmlModel):
-    method: Literal['manual', 'generated'] = attr()
+    method: Literal['manual', 'generated'] = attr(default='manual')
 
     sample: Optional[bool] = attr(default=None)
 
     description: Optional[str] = attr(default=None)
 
+    verdict: Optional[str] = attr(default=None)
+
 
 class Testset(BaseXmlModel):
     name: Optional[str] = attr(default=None)
@@ -60,7 +62,7 @@ class Judging(BaseXmlModel):
 
 class Checker(BaseXmlModel):
     name: Optional[str] = attr(default=None)
-    type: Literal['testlib'] = attr()
+    type: Literal['testlib'] = attr(default='testlib')
     source: File = element()
     binary: Optional[File] = element(default=None)
     cpy: Optional[File] = element(tag='copy', default=None)

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/rbx/box/presets/__init__.py

@@ -11,7 +11,7 @@ import semver
 import typer
 
 from rbx import console, utils
-from rbx.box import cd
+from rbx.box import cd, git_utils
 from rbx.box.git_utils import latest_remote_tag
 from rbx.box.presets.fetch import (
     PresetFetchInfo,
@@ -605,7 +605,18 @@ def _install_preset_from_remote(
         console.console.print(
             f'Cloning preset from [item]{fetch_info.fetch_uri}[/item]...'
         )
-        git.Repo.clone_from(fetch_info.fetch_uri, d)
+        repo = git.Repo.clone_from(fetch_info.fetch_uri, d)
+        if fetch_info.tool_tag is not None:
+            console.console.print(
+                f'Checking out tool tag [item]{fetch_info.tool_tag}[/item]...'
+            )
+            try:
+                repo.git.checkout(fetch_info.tool_tag)
+            except Exception as e:
+                console.console.print(
+                    f'[error]Could not checkout tool tag [item]{fetch_info.tool_tag}[/item] for preset [item]{fetch_info.name}[/item].[/error]'
+                )
+                raise typer.Exit(1) from e
         pd = pathlib.Path(d)
         if fetch_info.inner_dir:
             console.console.print(
@@ -719,14 +730,32 @@ def _install_preset_from_fetch_info(
             update=update,
         )
         return
-    if _install_preset_from_resources(
-        fetch_info,
-        dest,
-        ensure_contest=ensure_contest,
-        ensure_problem=ensure_problem,
-        update=update,
-    ):
+    if fetch_info.is_tool():
+        # Fallback to the remote tool tag if it exists.
+        assert fetch_info.tool_tag is not None
+        remote_fetch_info = get_preset_fetch_info(
+            get_remote_uri_from_tool_preset(fetch_info.name)
+        )
+        assert remote_fetch_info is not None
+        remote_fetch_info.tool_tag = fetch_info.tool_tag
+
+        _install_preset_from_remote(
+            remote_fetch_info,
+            dest,
+            ensure_contest=ensure_contest,
+            ensure_problem=ensure_problem,
+            update=update,
+        )
         return
+
+    # if _install_preset_from_resources(
+    #     fetch_info,
+    #     dest,
+    #     ensure_contest=ensure_contest,
+    #     ensure_problem=ensure_problem,
+    #     update=update,
+    # ):
+    #     return
     console.console.print(
         f'[error]Preset [item]{fetch_info.name}[/item] not found.[/error]'
     )
@@ -895,8 +924,6 @@ def _sync(try_update: bool = False, force: bool = False, symlinks: bool = False)
 def copy_tree_normalizing_gitdir(
     src_path: pathlib.Path, dst_path: pathlib.Path, update: bool = False
 ):
-    from rbx.box import git_utils
-
     shutil.copytree(str(src_path), str(dst_path), dirs_exist_ok=update, symlinks=True)
 
     if not (src_path / '.git').is_file():
@@ -918,8 +945,6 @@ def copy_local_preset(
 ):
     copy_tree_normalizing_gitdir(preset_path, dest_path / '.local.rbx')
 
-    from rbx.box import git_utils
-
     preset_repo = git_utils.get_repo_or_nil(preset_path)
     current_repo = git_utils.get_repo_or_nil(
         pathlib.Path.cwd(), search_parent_directories=True

{rbx_cp-0.16.0 → rbx_cp-0.16.2}/rbx/box/presets/fetch.py

@@ -4,6 +4,8 @@ from typing import Optional
 
 from pydantic import BaseModel
 
+_RBX_REMOTE_URI = 'https://github.com/rsalesc/rbx'
+
 
 class PresetFetchInfo(BaseModel):
     # The actual name of this preset.
@@ -18,12 +20,18 @@ class PresetFetchInfo(BaseModel):
     # Inner directory from where to pull the preset.
     inner_dir: str = ''
 
+    # Tool tag.
+    tool_tag: Optional[str] = None
+
     def is_remote(self) -> bool:
         return self.fetch_uri is not None
 
     def is_local_dir(self) -> bool:
         return bool(self.inner_dir) and not self.is_remote()
 
+    def is_tool(self) -> bool:
+        return self.tool_tag is not None
+
 
 def get_inner_dir_from_tool_preset(tool_preset: str) -> str:
     return f'rbx/resources/presets/{tool_preset}'
@@ -78,6 +86,7 @@ def get_preset_fetch_info(uri: Optional[str]) -> Optional[PresetFetchInfo]:
         match = compiled.match(s)
         if match is None:
             return None
+        # Treat as a plain local preset name (no implicit tool tag resolution).
         return PresetFetchInfo(name=s)
 
     extractors = [

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

rbx_cp-0.16.0/rbx/__version__.py

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