cfengine 0.23.2__tar.gz → 0.23.3__tar.gz

{cfengine-0.23.2 → cfengine-0.23.3}/.github/workflows/renovate.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7.0.1
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v46.3.6
+        uses: renovatebot/github-action@v46.3.7
         with:
           configurationFile: .github/renovate-config.js
           token: ${{ secrets.RENOVATE_TOKEN }}

{cfengine-0.23.2 → cfengine-0.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.23.2
+Version: 0.23.3
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -694,7 +694,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: cf-remote>=0.9.6
+Requires-Dist: cf-remote>=0.9.7
 Requires-Dist: cfbs>=5.8.1
 Requires-Dist: tree-sitter-cfengine>=1.1.12
 Requires-Dist: tree-sitter>=0.26.0

{cfengine-0.23.2 → cfengine-0.23.3}/pyproject.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 license = {file = "LICENSE"}
 requires-python = ">=3.10"
 dependencies = [
-    "cf-remote>=0.9.6",
+    "cf-remote>=0.9.7",
     "cfbs>=5.8.1",
     "tree-sitter-cfengine>=1.1.12",
     "tree-sitter>=0.26.0",

{cfengine-0.23.2 → cfengine-0.23.3}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.23.2
+Version: 0.23.3
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -694,7 +694,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: cf-remote>=0.9.6
+Requires-Dist: cf-remote>=0.9.7
 Requires-Dist: cfbs>=5.8.1
 Requires-Dist: tree-sitter-cfengine>=1.1.12
 Requires-Dist: tree-sitter>=0.26.0

{cfengine-0.23.2 → cfengine-0.23.3}/src/cfengine.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cf-remote>=0.9.6
+cf-remote>=0.9.7
 cfbs>=5.8.1
 tree-sitter-cfengine>=1.1.12
 tree-sitter>=0.26.0

cfengine-0.23.3/src/cfengine.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.23.3",
+  "distance": 0,
+  "node": "gd28211c12d899feeded9307a4a449d762db16550",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-09"
+}

{cfengine-0.23.2 → cfengine-0.23.3}/src/cfengine_cli/deptool.py

@@ -109,6 +109,8 @@ class GitRepo:
                           a ref from previous work might be left checked out.
         """
         self.repo_path = repo_path
+        self.repo_owner = repo_owner
+        self.repo_name = repo_name
 
         repo_url = "https://github.com/{}/{}.git".format(repo_owner, repo_name)
 
@@ -211,6 +213,36 @@ class GitRepo:
             return False
         return True
 
+    def upstream_remote(self):
+        result = self.run_command("remote", "-v", capture_output=True)
+        upstream = "github\\.com[:/]{}/{}(\\.git)?/?$".format(
+            re.escape(self.repo_owner), re.escape(self.repo_name)
+        )
+        for line in result.stdout.splitlines():
+            parts = line.split()
+            # GitHub owner and repository names are case-insensitive
+            if len(parts) >= 2 and re.search(upstream, parts[1], re.IGNORECASE):
+                return parts[0]
+        return None
+
+    def upstream_branch(self, ref):
+        remote = self.upstream_remote()
+        if remote is None:
+            log.warning(
+                "No remote points to github.com/{}/{}, using local refs".format(
+                    self.repo_owner, self.repo_name
+                )
+            )
+            return None
+        remote_ref = "{}/{}".format(remote, ref)
+        try:
+            self.run_command(
+                "show-ref", "--verify", "refs/remotes/{}".format(remote_ref)
+            )
+        except subprocess.CalledProcessError:
+            return None
+        return remote_ref
+
 
 def pretty(data):
     return json.dumps(data, indent=2)
@@ -311,10 +343,17 @@ class DepsReader:
         ```
         The ref is checked out during the execution of this function.
         """
-        self.buildscripts_repo.checkout(ref)
-        # also support checking out refs that are not necessarily branches, such as tags
-        if self.buildscripts_repo.is_git_branch(ref):
-            self.buildscripts_repo.run_command("pull")
+        upstream_ref = self.buildscripts_repo.upstream_branch(ref)
+        if upstream_ref is not None:
+            self.buildscripts_repo.checkout(upstream_ref)
+        else:
+            if self.buildscripts_repo.is_git_branch(ref):
+                log.warning(
+                    "Branch '{}' not found in upstream remote, using local branch".format(
+                        ref
+                    )
+                )
+            self.buildscripts_repo.checkout(ref)
 
         deps_versions = {}
         deps_list = self.deps_list(ref)

{cfengine-0.23.2 → cfengine-0.23.3}/src/cfengine_cli/syntax-description.json

@@ -3272,11 +3272,11 @@
     },
     "when": {
       "attributes": {
-        "files_deleted": {
-          "attribute": "files_deleted",
+        "file_deleted": {
+          "attribute": "file_deleted",
           "range": ".*",
           "status": "normal",
-          "type": "slist",
+          "type": "string",
           "visibility": "body"
         },
         "inherit_from": {

{cfengine-0.23.2 → cfengine-0.23.3}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 5
 requires-python = ">=3.10"
 
 [[package]]
@@ -34,14 +34,14 @@ wheels = [
 
 [[package]]
 name = "cf-remote"
-version = "0.9.6"
+version = "0.9.7"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "apache-libcloud" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e0/a5/28eec1ee83e065b580eff504c0dbe22c8a0682c9d0aba62b30198744cb6c/cf_remote-0.9.6.tar.gz", hash = "sha256:2025561e8cc8c2337a8e5924a32f29354ad8e62204bc562193e47754257e07e8", size = 80896, upload-time = "2026-09-16T19:45:46.151Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f8/1c/95679ba7b8ccd352f208e45d2d705be2939b43356985243f0cb75413f029/cf_remote-0.9.7.tar.gz", hash = "sha256:57911977d2e43f0e33f6fa3d0a962ff61e59d56e276beb3d10cefd5b86ffdb7c", size = 82960, upload-time = "2026-10-01T12:59:42.785Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4f/3b/f8258c38b15e480c72485f799f4ee796ad48ae9c12bf8fceb025c6f0de03/cf_remote-0.9.6-py3-none-any.whl", hash = "sha256:b7b60da04be3c37f195cee0ac2756f9b186915bd576c1d3292b489ff04b6ce95", size = 85236, upload-time = "2026-09-16T19:45:45.127Z" },
+    { url = "https://files.pythonhosted.org/packages/53/6d/2af2272785ca6a1b7b742d0b26d7f90a23bf8d60f6a56861392559bfd3e9/cf_remote-0.9.7-py3-none-any.whl", hash = "sha256:de3d3e2ebfd2f75e24ce08ee0110d48479ffe3070d44245ddf5927981b654dbf", size = 87566, upload-time = "2026-10-01T12:59:41.846Z" },
 ]
 
 [[package]]
@@ -75,7 +75,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "cf-remote", specifier = ">=0.9.6" },
+    { name = "cf-remote", specifier = ">=0.9.7" },
     { name = "cfbs", specifier = ">=5.8.1" },
     { name = "markdown-it-py", specifier = ">=4.2.0" },
     { name = "pydantic", specifier = ">=2.13.5" },

cfengine-0.23.2/src/cfengine.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.23.2",
-  "distance": 0,
-  "node": "g65afc1bd8b3f77fcd47eefe94ee19898b7fce5c8",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-30"
-}