checkmk-dev-tools 2.1.2__tar.gz → 2.1.4__tar.gz

{checkmk_dev_tools-2.1.2 → checkmk_dev_tools-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: checkmk-dev-tools
-Version: 2.1.2
+Version: 2.1.4
 Summary: Checkmk DevOps tools
 Author: Frans Fürst
 Author-email: frans.fuerst@checkmk.com
@@ -14,7 +14,7 @@ Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: python-jenkins (>=1.8.3,<1.9.0)
 Requires-Dist: rich
 Requires-Dist: trickkiste (>=0.3.4,<0.4.0)
-Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.2/changelog.md
+Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.4/changelog.md
 Project-URL: Repository, https://github.com/Checkmk/checkmk-dev-tools
 Description-Content-Type: text/markdown
 

{checkmk_dev_tools-2.1.2 → checkmk_dev_tools-2.1.4}/cmk_dev/ci_artifacts.py

@@ -582,7 +582,7 @@ async def build_id_from_queue_item(
 ) -> BuildId:
     """Waits for queue item with given @queue_id to be scheduled and returns Build instance"""
     if queue_item is None:
-        queue_item = await client.queue_item(queue_id)
+        queue_item = await client.queue_item(queue_id, depth=1)
 
     log().info(
         "waiting for queue item %s to be scheduled (%s%s)",
@@ -592,7 +592,7 @@ async def build_id_from_queue_item(
     )
 
     while True:
-        queue_item = await client.queue_item(queue_id)
+        queue_item = await client.queue_item(queue_id, depth=1)
         if queue_item.executable:
             return queue_item.executable.number
         log().debug("still waiting in queue, because %s", queue_item.why)
@@ -640,9 +640,7 @@ async def find_matching_queue_item(
     """Looks for a queued build matching job and parameters and returns the QueueId"""
     log().debug("Checking queued items with the Jenkins API")
 
-    for simple_queue_item in await jenkins_client.queue_info():
-        queue_item = await jenkins_client.queue_item(simple_queue_item.id, depth=2)
-
+    for queue_item in await jenkins_client.queue_info():
         # In order to compare with `job.url` we would have to inject the jenkins base URL
         # Instead we can also strip it off from `job.url` and compare relative URLs instead
         # Instead of "https://ci.com/job/name/42/" == "https://ci.com/job/name/42/" we compare

{checkmk_dev_tools-2.1.2 → checkmk_dev_tools-2.1.4}/cmk_dev/jenkins_utils/__init__.py

@@ -695,9 +695,10 @@ def _set_jenkins_client_user_agent() -> Generator[None, None, None]:
     # Preserve an maybe externall set user agent setting
     given_user_agent = os.environ.get(env_var_name)
 
-    os.environ[env_var_name] = (
-        f"User-Agent: ci-artifacts {__version__} (python-requests {requests.__version__})"
-    )
+    if not given_user_agent:
+        os.environ[env_var_name] = (
+            f"User-Agent: ci-artifacts {__version__} (python-requests {requests.__version__})"
+        )
     try:
         yield
     finally:

{checkmk_dev_tools-2.1.2 → checkmk_dev_tools-2.1.4}/cmk_dev/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
-__version_info__ = ("2", "1", "2")
+__version_info__ = ("2", "1", "4")
 __version__ = '.'.join(__version_info__)

{checkmk_dev_tools-2.1.2 → checkmk_dev_tools-2.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "checkmk-dev-tools"
-version = "2.1.2" # will-be-updated-automatically
+version = "2.1.4" # will-be-updated-automatically
 description = "Checkmk DevOps tools"
 authors = [
     "Frans Fürst <frans.fuerst@checkmk.com>",
@@ -14,7 +14,7 @@ exclude = ["cmk_dev/out"]
 
 [tool.poetry.urls]
 Repository = "https://github.com/Checkmk/checkmk-dev-tools"
-Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.2/changelog.md"
+Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.4/changelog.md"
 
 [tool.poetry.scripts]
 activity-from-fs = 'cmk_dev.activity_from_fs:main'