devnomads 0.2.0__tar.gz → 0.2.1__tar.gz

devnomads-0.2.1/.gitlab-ci.yml

@@ -0,0 +1,82 @@
+stages:
+  - check
+  - test
+  - publish
+
+default:
+  image: ghcr.io/astral-sh/uv:python3.14-alpine
+  before_script:
+    # dev tools + the acme extra, so linting and tests cover devnomads.acme.
+    - uv sync --dev --extra acme
+
+check:
+  stage: check
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "trigger"
+  script:
+    - uv run python tools/generate.py --check
+    - uv run black --check .
+    - uv run isort --check-only .
+    - uv run flake8 src tests
+    - uv run bandit -r src
+    - uv run semgrep scan --quiet --error --config p/python src
+    - uv run mypy src
+
+test:
+  stage: test
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "trigger"
+  parallel:
+    matrix:
+      - PYTHON: ["3.10", "3.14"]
+  image: ghcr.io/astral-sh/uv:python$PYTHON-alpine
+  script:
+    - uv run pytest -v
+
+# Runs on version tags (v0.1.0). PYPI_TOKEN (masked) and
+# PYPI_PUBLISH_URL are CI variables pointing at pypi.org; the
+# PYPI_TEST_* variants hold the test.pypi.org equivalents - swap them
+# in to rehearse a release without publishing for real.
+publish:
+  stage: publish
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v/
+  before_script: []
+  script:
+    - uv build
+    - uv publish --publish-url "$PYPI_PUBLISH_URL" --token "$PYPI_TOKEN"
+
+# Triggered by the DevNomads API deploy pipeline (a pipeline trigger
+# token). Refreshes the OpenAPI spec, regenerates the SDK, and - only if
+# the spec actually changed - auto-bumps the patch version, commits the
+# regenerated code back, and pushes a tag. The publish job above turns
+# that tag into a PyPI release. Runs only on a trigger, so it never
+# recurses on the branch/tag pushes it creates.
+#
+# Requires CI variables:
+#   GITLAB_PUSH_TOKEN - project/group access token (Maintainer role,
+#     write_repository scope) allowed to push the default branch and tags.
+#   PYPI_TOKEN / PYPI_PUBLISH_URL - used by the publish job on the tag.
+auto-release:
+  stage: check
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "trigger"
+  resource_group: auto-release
+  script:
+    - apk add --no-cache git curl
+    - curl -sf "https://api.devnomads.nl/docs?api-docs.json" -o openapi.json
+    - uv run python tools/generate.py
+    - uv run black -q . && uv run isort -q .
+    - |
+      if git diff --quiet -- openapi.json src/devnomads/api/_services.py; then
+        echo "spec unchanged; nothing to release"; exit 0
+      fi
+    - NEW=$(uv run python tools/bump_version.py)
+    - uv lock
+    - git config user.name "devnomads-ci"
+    - git config user.email "ci@devnomads.nl"
+    - git add openapi.json src/devnomads/api/_services.py pyproject.toml uv.lock
+    - 'git commit -m "chore: auto-regenerate sdk from api spec (v${NEW})"'
+    - git tag -a "v${NEW}" -m "v${NEW}"
+    - git remote set-url origin "https://oauth2:${GITLAB_PUSH_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
+    - git push origin "HEAD:${CI_DEFAULT_BRANCH}" --follow-tags

{devnomads-0.2.0 → devnomads-0.2.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: devnomads
-Version: 0.2.0
-Summary: Python client for the DevNomads API (transport, DNS, ACME)
+Version: 0.2.1
+Summary: Python client library for the DevNomads API (transport, DNS, ACME)
 Project-URL: Homepage, https://devnomads.nl
 Author-email: Loek Geleijn <support@devnomads.nl>
 License: MIT

{devnomads-0.2.0 → devnomads-0.2.1}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "devnomads"
-version = "0.2.0"
-description = "Python client for the DevNomads API (transport, DNS, ACME)"
+version = "0.2.1"
+description = "Python client library for the DevNomads API (transport, DNS, ACME)"
 readme = "README.md"
 requires-python = ">=3.10"
 license = { text = "MIT" }

{devnomads-0.2.0 → devnomads-0.2.1}/src/devnomads/acme/client.py

@@ -76,7 +76,7 @@ class AcmeClient:
         directory = messages.Directory.from_json(net.get(self.directory_url).json())
         client = acme_client.ClientV2(directory, net)
 
-        new_account = messages.NewAccount(
+        new_account = messages.NewRegistration(
             contact=(f"mailto:{self.contact_email}",) if self.contact_email else (),
             terms_of_service_agreed=True,
             only_return_existing=False,

{devnomads-0.2.0 → devnomads-0.2.1}/tests/test_acme_client.py

@@ -62,3 +62,53 @@ def test_split_fullchain_no_marker():
     leaf_pem, chain_pem = _split_fullchain("garbage")
     assert leaf_pem == "garbage"
     assert chain_pem == ""
+
+
+def test_init_client_registers_with_new_registration(monkeypatch, tmp_path):
+    """_init_client must build a real acme.messages.NewRegistration and hand
+    it to new_account; this exercises the message construction that a wrong
+    class name (e.g. the non-existent NewAccount) would break."""
+
+    from acme import messages
+
+    from devnomads.acme import client as client_mod
+
+    captured = {}
+
+    class FakeResponse:
+        def json(self):
+            return {}
+
+    class FakeNetwork:
+        def __init__(self, *args, **kwargs):
+            self.account = None
+
+        def get(self, url):
+            return FakeResponse()
+
+    class FakeClientV2:
+        def __init__(self, directory, net):
+            self.net = net
+
+        def new_account(self, registration):
+            captured["registration"] = registration
+            return SimpleNamespace(uri="https://acme.example/acct/1")
+
+    monkeypatch.setattr(
+        client_mod, "load_or_create_account_key", lambda *a, **k: object()
+    )
+    monkeypatch.setattr(client_mod.acme_client, "ClientNetwork", FakeNetwork)
+    monkeypatch.setattr(client_mod.acme_client, "ClientV2", FakeClientV2)
+    monkeypatch.setattr(
+        client_mod.messages.Directory, "from_json", lambda data: object()
+    )
+
+    ac = client_mod.AcmeClient(
+        str(tmp_path / "account.pem"), contact_email="ops@example.com"
+    )
+    client, _account_key = ac._init_client()
+
+    registration = captured["registration"]
+    assert isinstance(registration, messages.NewRegistration)
+    assert registration.contact == ("mailto:ops@example.com",)
+    assert client.net.account is not None

devnomads-0.2.1/tools/bump_version.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+"""Bump the patch version in pyproject.toml and print the new version.
+
+Used by the auto-release CI job so each spec-driven regeneration gets a
+fresh, monotonically increasing version (PyPI versions are immutable).
+"""
+
+from __future__ import annotations
+
+import pathlib
+import re
+import sys
+
+PYPROJECT = pathlib.Path(__file__).resolve().parent.parent / "pyproject.toml"
+
+
+def main() -> int:
+    text = PYPROJECT.read_text()
+    match = re.search(r'^version = "(\d+)\.(\d+)\.(\d+)"', text, re.MULTILINE)
+    if not match:
+        print("error: could not find a version in pyproject.toml", file=sys.stderr)
+        return 1
+    major, minor, patch = (int(g) for g in match.groups())
+    new_version = f"{major}.{minor}.{patch + 1}"
+    PYPROJECT.write_text(
+        text[: match.start()] + f'version = "{new_version}"' + text[match.end() :]
+    )
+    print(new_version)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{devnomads-0.2.0 → devnomads-0.2.1}/uv.lock

@@ -468,7 +468,7 @@ wheels = [
 
 [[package]]
 name = "devnomads"
-version = "0.2.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

devnomads-0.2.0/.gitlab-ci.yml

@@ -1,43 +0,0 @@
-stages:
-  - check
-  - test
-  - publish
-
-default:
-  image: ghcr.io/astral-sh/uv:python3.14-alpine
-  before_script:
-    # dev tools + the acme extra, so linting and tests cover devnomads.acme.
-    - uv sync --dev --extra acme
-
-check:
-  stage: check
-  script:
-    - uv run python tools/generate.py --check
-    - uv run black --check .
-    - uv run isort --check-only .
-    - uv run flake8 src tests
-    - uv run bandit -r src
-    - uv run semgrep scan --quiet --error --config p/python src
-    - uv run mypy src
-
-test:
-  stage: test
-  parallel:
-    matrix:
-      - PYTHON: ["3.10", "3.14"]
-  image: ghcr.io/astral-sh/uv:python$PYTHON-alpine
-  script:
-    - uv run pytest -v
-
-# Runs on version tags (v0.1.0). PYPI_TOKEN (masked) and
-# PYPI_PUBLISH_URL are CI variables pointing at pypi.org; the
-# PYPI_TEST_* variants hold the test.pypi.org equivalents - swap them
-# in to rehearse a release without publishing for real.
-publish:
-  stage: publish
-  rules:
-    - if: $CI_COMMIT_TAG =~ /^v/
-  before_script: []
-  script:
-    - uv build
-    - uv publish --publish-url "$PYPI_PUBLISH_URL" --token "$PYPI_TOKEN"