polygit 0.3.2__tar.gz → 0.3.4__tar.gz

polygit-0.3.4/.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+    tags: ["v*.*.*"]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: uv sync
+      - run: uv run pytest
+
+  build:
+    needs: test
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: uv build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  deploy:
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - run: uv publish --token ${{ secrets.PYPI_API_TOKEN }}

{polygit-0.3.2 → polygit-0.3.4}/AGENTS.md

@@ -8,8 +8,8 @@ manages multiple git repos (across GitHub/GitLab, multiple orgs/namespaces) from
 very `~/development/gitlab` tree these AGENTS.md files live in.
 
 Standard `src`-layout Python package (`pyproject.toml`, `uv.lock` — uses `uv`, not
-pip/poetry, for dev dependency management). `.gitlab-ci.yml` presumably builds/publishes on
-tag, mirroring `gitlab-ci-generator`'s pattern.
+pip/poetry, for dev dependency management). Hosted on GitHub (moved from GitLab); CI is
+`.github/workflows/ci.yml` — test on every push/PR, build+publish to PyPI on `v*.*.*` tags.
 
 Replaced an older `sync.sh` script (see recent commit history) — if you find references to
 `sync.sh` elsewhere in the user's dotfiles/bootstrap scripts, they're stale.

{polygit-0.3.2 → polygit-0.3.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: polygit
-Version: 0.3.2
+Version: 0.3.4
 Summary: Manage multiple git repos from a single .pgit config file.
-Project-URL: Repository, https://gitlab.com/gary.schaetz/public/polygit
+Project-URL: Repository, https://github.com/gschaetz/polygit
 Author-email: Gary Schaetz <gary@schaetzkc.com>
 License: MIT License
         
@@ -36,7 +36,7 @@ Description-Content-Type: text/markdown
 Manage multiple git repos from a single `.pgit` config file.
 
 ```bash
-pip install polygit
+uv tool install polygit
 ```
 
 ## Usage

{polygit-0.3.2 → polygit-0.3.4}/README.md

@@ -3,7 +3,7 @@
 Manage multiple git repos from a single `.pgit` config file.
 
 ```bash
-pip install polygit
+uv tool install polygit
 ```
 
 ## Usage

{polygit-0.3.2 → polygit-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "polygit"
-version = "0.3.2"
+version = "0.3.4"
 description = "Manage multiple git repos from a single .pgit config file."
 readme = "README.md"
 license = { file = "LICENSE.txt" }
@@ -16,7 +16,7 @@ dependencies = [
 ]
 
 [project.urls]
-Repository = "https://gitlab.com/gary.schaetz/public/polygit"
+Repository = "https://github.com/gschaetz/polygit"
 
 [project.scripts]
 pgit = "polygit.cli:main"

{polygit-0.3.2 → polygit-0.3.4}/src/polygit/repos.py

@@ -40,28 +40,24 @@ def del_nested(d, keys):
 
 
 def _add_to_config(config, fs_platform, local_path, remote_url):
-    """Insert a repo entry into the config data structure."""
+    """Insert a repo entry into the config data structure.
+
+    Always nests under the *local* namespace (the repo's actual directory
+    location), with a `{remote: ...}` override when the remote path differs
+    — e.g. a repo cloned under a local namespace unrelated to its remote
+    org/namespace.
+    """
     local_parts = local_path.split("/")
     local_name  = local_parts[-1]
+    local_ns    = "/".join(local_parts[:-1])
     _, remote_path = parse_remote_url(remote_url)
     platform_data = config.setdefault(fs_platform, {})
+    ns_data = platform_data.setdefault(local_ns, {})
 
-    if remote_path:
-        r_parts = remote_path.split("/")
-        r_name  = r_parts[-1]
-        r_ns    = "/".join(r_parts[:-1])
-        ns_data = platform_data.setdefault(r_ns, {})
-        if local_path == f"{r_ns}/{r_name}":
-            ns_data[r_name] = None
-        else:
-            sub  = local_path[len(r_ns)+1:] if local_path.startswith(r_ns + "/") else local_name
-            node = ns_data
-            for part in sub.split("/")[:-1]:
-                node = node.setdefault(part, {})
-            node[sub.split("/")[-1]] = {"remote": remote_path}
+    if remote_path and remote_path != local_path:
+        ns_data[local_name] = {"remote": remote_path}
     else:
-        local_ns = "/".join(local_parts[:-1])
-        platform_data.setdefault(local_ns, {})[local_name] = None
+        ns_data[local_name] = None
 
 
 def cmd_repos(config, base, config_path):

{polygit-0.3.2 → polygit-0.3.4}/tests/test_polygit.py

@@ -2,7 +2,7 @@ import tempfile
 import pytest
 from pathlib import Path
 from polygit.config import find_config, load_config, write_config
-from polygit.repos import parse_remote_url, del_nested
+from polygit.repos import parse_remote_url, del_nested, _add_to_config
 from polygit.repo import walk
 
 
@@ -59,6 +59,26 @@ def test_del_nested_preserves_siblings():
     assert d == {"a": {"c": None}}
 
 
+# ── _add_to_config ──────────────────────────────────────────────────────────
+
+def test_add_to_config_plain():
+    config = {}
+    _add_to_config(config, "github", "gschaetz/mousehat", "git@github.com:gschaetz/mousehat.git")
+    assert config == {"github": {"gschaetz": {"mousehat": None}}}
+
+def test_add_to_config_cross_namespace_override():
+    # Local dir lives under a namespace unrelated to the remote org — must
+    # nest under the local namespace, not silently fall back to the remote's.
+    config = {}
+    _add_to_config(config, "github", "community/modelrelay", "git@github.com:ellipticmarketing/modelrelay.git")
+    assert config == {"github": {"community": {"modelrelay": {"remote": "ellipticmarketing/modelrelay"}}}}
+
+def test_add_to_config_no_remote():
+    config = {}
+    _add_to_config(config, "github", "gschaetz/scratch", None)
+    assert config == {"github": {"gschaetz": {"scratch": None}}}
+
+
 # ── find_config / write_config / load_config ──────────────────────────────────
 
 def test_find_config_in_cwd():

{polygit-0.3.2 → polygit-0.3.4}/uv.lock

@@ -90,7 +90,7 @@ wheels = [
 
 [[package]]
 name = "polygit"
-version = "0.3.2"
+version = "0.3.3"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },

polygit-0.3.2/.gitlab-ci.yml

@@ -1,57 +0,0 @@
-include:
-  - project: "gary.schaetz/private/pipelines"
-    ref: main
-    file: 'templates/rules/rules.yml'
-
-stages:
-  - test
-  - build
-  - deploy
-
-variables:
-  UV_NO_SYNC: "0"
-
-test:
-  image: gschaetz/python:latest
-  stage: test
-  tags:
-    - docker
-    - kubernetes
-  # Explicit rules instead of relying on GitLab's implicit default (only: [branches, tags]):
-  # that default happens to exclude merge_request_event already, but making it explicit here
-  # matches the pattern every other repo running on these self-hosted runners uses, rather
-  # than depending on undocumented default behavior for a job that runs arbitrary repo code.
-  rules:
-    - !reference [.job_rules, standard-rule]
-    - !reference [.job_rules, manual-rule]
-    - !reference [.job_rules, schedule-rule]
-  script:
-    - uv sync
-    - uv run pytest
-
-build:
-  image: gschaetz/python:latest
-  stage: build
-  tags:
-    - docker
-    - kubernetes
-  rules:
-    - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/
-  script:
-    - uv build
-  artifacts:
-    paths:
-      - dist/
-
-deploy:
-  image: gschaetz/python:latest
-  stage: deploy
-  tags:
-    - docker
-    - kubernetes
-  rules:
-    - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/
-  dependencies:
-    - build
-  script:
-    - uv publish --token $PYPI_API_TOKEN