github-rest-api 0.35.0__tar.gz → 0.37.0__tar.gz

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/.github/workflows/test.yml

@@ -23,3 +23,5 @@ jobs:
         uv sync --all-extras
     - name: Test with pytest
       run: uv run --python ${{ matrix.python-version }} pytest
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github-rest-api
-Version: 0.35.0
+Version: 0.37.0
 Summary: Simple wrapper of GitHub REST APIs.
 Author-email: Ben Du <longendu@yahoo.com>
 Classifier: Programming Language :: Python :: 3 :: Only

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/github_rest_api/actions/container/build_container_images.py

@@ -1,4 +1,5 @@
 import argparse
+from collections.abc import Sequence
 import datetime
 from pathlib import Path
 import subprocess as sp
@@ -59,7 +60,8 @@ def changed_files_between(
 def has_relevant_changes(
     commit1: str | bytes,
     commit2: str | bytes,
-    image_dirs: list[str],
+    image_dirs: Sequence[str],
+    paths_monitoring: Sequence[str] = (),
     name1: str = "",
     name2: str = "",
 ) -> bool:
@@ -69,20 +71,25 @@ def has_relevant_changes(
         commit1 = commit1.encode()
     if isinstance(commit2, str):
         commit2 = commit2.encode()
-    dirs = [Path(d).resolve() for d in image_dirs]
+    monitored = [Path(m).resolve() for m in (*image_dirs, *paths_monitoring)]
     for p in changed_files_between(commit1, commit2, name1=name1, name2=name2):
-        if any(p.resolve().is_relative_to(d) for d in dirs):
+        p_resolved = p.resolve()
+        if any(p_resolved.is_relative_to(m) for m in monitored):
             return True
     return False
 
 
-def has_relevant_changes_main_dev(image_dirs: list[str]) -> bool:
+def has_relevant_changes_main_dev(
+    image_dirs: Sequence[str], paths_monitoring: Sequence[str] = ()
+) -> bool:
     try:
         c_main = _get_commit(b"main")
         c_dev = _get_commit(b"dev")
     except (KeyError, NotGitRepository):
         return True
-    return has_relevant_changes(c_main, c_dev, image_dirs, name1="main", name2="dev")
+    return has_relevant_changes(
+        c_main, c_dev, image_dirs, paths_monitoring, name1="main", name2="dev"
+    )
 
 
 def _tag_date(tag: str) -> str:
@@ -127,11 +134,12 @@ def _build_image(
 def build_images(
     commit1: str,
     commit2: str,
-    image_dirs: list[str],
+    image_dirs: Sequence[str],
+    paths_monitoring: Sequence[str] = (),
     tool: str = "podman",
     registry: str = "quay.io/legendu",
 ):
-    if not has_relevant_changes(commit1, commit2, image_dirs):
+    if not has_relevant_changes(commit1, commit2, image_dirs, paths_monitoring):
         print(
             f"Skip building {tool} images as there are no relevant changes between {
                 commit1
@@ -139,7 +147,7 @@ def build_images(
         )
         return
     tags = ["next"]
-    if not has_relevant_changes_main_dev(image_dirs):
+    if not has_relevant_changes_main_dev(image_dirs, paths_monitoring):
         tags.append("latest")
     tags.extend([_tag_date(tag) for tag in tags])
     print(f"Building {tool} images using tags:", ", ".join(tags), "\n", flush=True)
@@ -207,6 +215,14 @@ def parse_args():
         metavar="FILE",
         help="Path to a file listing image directories to build, one per line.",
     )
+    parser.add_argument(
+        "--paths-monitoring",
+        dest="paths_monitoring",
+        nargs="*",
+        default=(),
+        metavar="PATH",
+        help="Extra paths to monitor for changes in addition to the image directories.",
+    )
     return parser.parse_args()
 
 
@@ -223,6 +239,7 @@ def main():
         args.commit1,
         args.commit2,
         _resolve_image_dirs(args),
+        paths_monitoring=args.paths_monitoring,
         tool=args.tool,
         registry=args.registry,
     )

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/github_rest_api/actions/container/update_version_containerfile.py

@@ -28,83 +28,15 @@ def parse_latest_version(repo: str) -> str:
 def update_version(
     containerfile: str | Path, version: str, pattern: str, replace: str
 ) -> None:
-    if containerfile == "":
-        containerfile = "Dockerfile" if Path("Dockerfile").exists() else "Containerfile"
+    if not pattern:
+        raise ValueError("The pattern to replace must not be empty.")
     if isinstance(containerfile, str):
-        containerfile = Path(containerfile).resolve()
-    match containerfile.parent.name:
-        case "docker-base":
-            return _update_version_docker_base(
-                containerfile=containerfile, version=version
-            )
-        case "docker-jupyterlab":
-            return _update_version_docker_jupyterlab(
-                containerfile=containerfile, version=version
-            )
-        case "docker-jupyterhub":
-            return _update_version_docker_jupyterhub(
-                containerfile=containerfile, version=version
-            )
-        case "docker-vscode-server":
-            return _update_version_docker_vscode_server(
-                containerfile=containerfile, version=version
-            )
-        case _:
-            if not pattern:
-                raise ValueError("A version pattern must be specified!")
-            return _update_version_default(
-                containerfile=containerfile,
-                version=version,
-                pattern=pattern,
-                replace=replace,
-            )
-
-
-def _update_version_default(
-    containerfile: Path, version: str, pattern: str, replace: str
-) -> None:
-    text = containerfile.read_text()
-    text = re.sub(pattern, replace.format(version=version), text)
-    containerfile.write_text(text)
-
-
-def _update_version_docker_base(containerfile: Path, version: str) -> None:
-    _update_version_default(
-        containerfile=containerfile,
-        version=version,
-        pattern=r"-v v?\d+\.\d+\.\d+",
-        replace="-v v{version}",
-    )
-
-
-def _update_version_docker_jupyterlab(containerfile: Path, version: str) -> None:
-    version = next_minor_or_strip_patch(version, 3)
-    _update_version_default(
-        containerfile=containerfile,
-        version=version,
-        pattern=r",<\d+\.\d+\.0",
-        replace=",<{version}",
-    )
-
-
-def _update_version_docker_jupyterhub(containerfile: Path, version: str) -> None:
-    version = next_minor_or_strip_patch(version, 3)
-    _update_version_default(
-        containerfile=containerfile,
-        version=version,
-        pattern=r"jupyterhub<\d+\.\d+\.0",
-        replace="jupyterhub<{version}",
-    )
-
-
-def _update_version_docker_vscode_server(containerfile: Path, version: str) -> None:
-    version = next_minor_or_strip_patch(version, 3)
-    _update_version_default(
-        containerfile=containerfile,
-        version=version,
-        pattern=r",<\d+\.\d+\.0",
-        replace=",<{version}",
-    )
+        containerfile = Path(containerfile)
+    original = containerfile.read_text(encoding="utf-8")
+    repl = replace.replace("{version}", version)
+    updated = re.sub(pattern, lambda _: repl, original)
+    if updated != original:
+        containerfile.write_text(updated, encoding="utf-8")
 
 
 def _branch_prefix(repo: str) -> str:
@@ -134,7 +66,7 @@ def parse_args():
     parser.add_argument(
         "--containerfile",
         dest="containerfile",
-        default="",
+        required=True,
         help="The Dockerfile or Containerfile to update.",
     )
     parser.add_argument(
@@ -152,15 +84,25 @@ def parse_args():
     parser.add_argument(
         "--pattern",
         dest="pattern",
-        default="",
+        required=True,
         help="The version pattern to replace.",
     )
     parser.add_argument(
         "--replace",
         dest="replace",
-        default="",
+        required=True,
         help="The replacement for the matched version pattern.",
     )
+    parser.add_argument(
+        "--next-minor-or-strip-patch",
+        dest="next_minor_or_strip_patch",
+        type=int,
+        default=None,
+        help=(
+            "If provided, transform the version with next_minor_or_strip_patch(version, N): "
+            "bump to next minor if patch >= N, otherwise strip patch to 0."
+        ),
+    )
     return parser.parse_args()
 
 
@@ -188,6 +130,8 @@ def main():
         return
     checkout_branch(args.repo)
     version = parse_latest_version(repo=args.repo)
+    if args.next_minor_or_strip_patch is not None:
+        version = next_minor_or_strip_patch(version, args.next_minor_or_strip_patch)
     update_version(
         containerfile=args.containerfile,
         version=version,

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "hatchling" ]
 
 [project]
 name = "github-rest-api"
-version = "0.35.0"
+version = "0.37.0"
 description = "Simple wrapper of GitHub REST APIs."
 readme = "README.md"
 authors = [ { name = "Ben Du", email = "longendu@yahoo.com" } ]

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/tests/test_github.py

@@ -1,25 +1,22 @@
+import os
 from github_rest_api.github import User, Organization, Repository
 
+TOKEN = os.environ.get("GITHUB_TOKEN", "")
+
 
 def test_user_get_repositories():
-    token = ""
-    username = "dclong"
-    user = User(token, username)
+    user = User(TOKEN, "dclong")
     repos = user.get_repositories()
     assert len(repos) > 0
 
 
 def test_organization_get_repositories():
-    token = ""
-    org_name = "legendu-net"
-    org = Organization(token, org_name)
+    org = Organization(TOKEN, "legendu-net")
     repos = org.get_repositories()
     assert len(repos) > 0
 
 
 def test_repository_get_branch():
-    token = ""
-    repo_name = "legendu-net/github_rest_api"
-    repo = Repository(token, repo_name)
+    repo = Repository(TOKEN, "legendu-net/github_rest_api")
     branch = repo.get_branch("main")
     assert branch["name"] == "main"

{github_rest_api-0.35.0 → github_rest_api-0.37.0}/uv.lock

@@ -166,7 +166,7 @@ wheels = [
 
 [[package]]
 name = "github-rest-api"
-version = "0.35.0"
+version = "0.36.0"
 source = { editable = "." }
 dependencies = [
     { name = "dulwich" },