feat: release_service_utils as python package

midnightercz · midnightercz · commit 00c0b32a4e78 · 2026-05-28T16:46:13.000+02:00
scripts/python/* is now shipped as python
package which can be imported as release_service_utils

Assisted-By: claude
Signed-off-by: Jindrich Luza &lt;jluza@redhat.com&gt;
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,6 +23,21 @@ dependencies = [
     "confluent-kafka",
 ]
 
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = [
+    "release_service_utils",
+    "release_service_utils.helpers",
+    "release_service_utils.tasks",
+    "release_service_utils.tasks.internal",
+]
+
+[tool.setuptools.package-dir]
+"release_service_utils" = "scripts/python"
+
 [tool.black]
 line-length = 95
 
diff --git a/scripts/python/__init__.py b/scripts/python/__init__.py
@@ -0,0 +1 @@
+"""Release Service Utils Python Package."""
diff --git a/scripts/python/helpers/__init__.py b/scripts/python/helpers/__init__.py
@@ -1 +1,11 @@
 """Reusable Python helpers for release task scripts."""
+__all__ = [
+    "authentication",
+    "file",
+    "http_client",
+    "image_ref",
+    "logger",
+    "osidb",
+    "retry",
+    "tekton"
+]
diff --git a/scripts/python/helpers/authentication.py b/scripts/python/helpers/authentication.py
@@ -13,7 +13,7 @@
 from collections.abc import Sequence
 from pathlib import Path
 
-import retry
+from release_service_utils.helpers import retry
 
 
 def read_mounted_text(mount: Path, filename: str) -> str:
diff --git a/scripts/python/helpers/osidb.py b/scripts/python/helpers/osidb.py
@@ -16,7 +16,7 @@
 import json
 from typing import Any
 
-import http_client
+from release_service_utils.helpers import http_client
 from requests_kerberos import HTTPKerberosAuth, OPTIONAL
 
 
diff --git a/scripts/python/helpers/tests/__init__.py b/scripts/python/helpers/tests/__init__.py
diff --git a/scripts/python/helpers/tests/test_authentication.py b/scripts/python/helpers/tests/test_authentication.py
@@ -9,7 +9,7 @@
 
 import pytest
 
-import authentication
+from release_service_utils.helpers import authentication
 
 
 def test_read_mounted_text_strips_whitespace(tmp_path: Path) -> None:
diff --git a/scripts/python/helpers/tests/test_file.py b/scripts/python/helpers/tests/test_file.py
@@ -4,9 +4,10 @@
 
 from pathlib import Path
 
-import file
 import pytest
 
+from release_service_utils.helpers import file
+
 
 def test_path_from_env_variable_uses_set_value(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
diff --git a/scripts/python/helpers/tests/test_http_client.py b/scripts/python/helpers/tests/test_http_client.py
@@ -8,7 +8,7 @@
 import requests
 from requests.adapters import HTTPAdapter
 
-import http_client
+from release_service_utils.helpers import http_client
 
 
 def test_retries_policy_defaults() -> None:
diff --git a/scripts/python/helpers/tests/test_image_ref.py b/scripts/python/helpers/tests/test_image_ref.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-import image_ref
+from release_service_utils.helpers import image_ref
+
 import pytest
 
 
diff --git a/scripts/python/helpers/tests/test_logger.py b/scripts/python/helpers/tests/test_logger.py
diff --git a/scripts/python/helpers/tests/test_osidb.py b/scripts/python/helpers/tests/test_osidb.py
@@ -7,15 +7,15 @@
 import pytest
 import requests_kerberos
 
-import osidb
+from release_service_utils.helpers import osidb
 
 
 def test_get_access_token_returns_access_string() -> None:
     """
     A JSON body with a non-empty string ``access`` is returned, and the token URL
     is ``{base}/auth/token`` (trailing slash on the base is stripped before join).
     """
-    with mock.patch("http_client.get_text", return_value='{"access": "tok-abc"}') as m:
+    with mock.patch("osidb.http_client.get_text", return_value='{"access": "tok-abc"}') as m:
         out = osidb.get_access_token("https://osidb.example.com/")
     assert out == "tok-abc"
     m.assert_called_once()
@@ -27,7 +27,7 @@ def test_get_access_token_returns_access_string() -> None:
 
 def test_get_access_token_rejects_empty_body() -> None:
     """A blank HTTP body raises with a message about the token request."""
-    with mock.patch("http_client.get_text", return_value=""):
+    with mock.patch("osidb.http_client.get_text", return_value=""):
         with pytest.raises(ValueError) as e:
             osidb.get_access_token("https://u")
     assert e.value
@@ -37,7 +37,7 @@ def test_get_access_token_rejects_empty_body() -> None:
 @pytest.mark.parametrize("body", ['{"x": 1}', '{"access": ""}'])
 def test_get_access_token_rejects_invalid_access(body: str) -> None:
     """``ValueError`` when JSON has no non-empty string ``access`` (missing or empty)."""
-    with mock.patch("http_client.get_text", return_value=body):
+    with mock.patch("osidb.http_client.get_text", return_value=body):
         with pytest.raises(ValueError) as e:
             osidb.get_access_token("https://u")
     assert "access" in str(e.value) or e.value
diff --git a/scripts/python/helpers/tests/test_retry.py b/scripts/python/helpers/tests/test_retry.py
diff --git a/scripts/python/helpers/tests/test_tekton.py b/scripts/python/helpers/tests/test_tekton.py
diff --git a/scripts/python/tasks/__init__.py b/scripts/python/tasks/__init__.py
@@ -0,0 +1 @@
+"""Release Service Utils Python Tasks."""
diff --git a/scripts/python/tasks/internal/__init__.py b/scripts/python/tasks/internal/__init__.py
@@ -0,0 +1 @@
+"""Release Service Utils Python Internal Tasks."""
diff --git a/scripts/python/tasks/internal/check_embargoed_cves.py b/scripts/python/tasks/internal/check_embargoed_cves.py
@@ -33,11 +33,11 @@
 import requests
 import urllib.parse
 
-import authentication
-import file
-import http_client
-import osidb
-import tekton
+from release_service_utils.helpers import authentication
+from release_service_utils.helpers import file
+from release_service_utils.helpers import http_client
+from release_service_utils.helpers import osidb
+from release_service_utils.helpers import tekton
 
 PROG = "check_embargoed_cves.py"
 
diff --git a/scripts/python/tasks/internal/check_fbc_opt_in.py b/scripts/python/tasks/internal/check_fbc_opt_in.py
@@ -17,12 +17,12 @@
 from requests.auth import AuthBase
 from requests_kerberos import HTTPKerberosAuth, OPTIONAL
 
-import authentication
-import file
-import http_client
-import image_ref
-import tekton
-from logger import logger
+from release_service_utils.helpers import authentication
+from release_service_utils.helpers import file
+from release_service_utils.helpers import http_client
+from release_service_utils.helpers import image_ref
+from release_service_utils.helpers import tekton
+from release_service_utils.helpers.logger import logger
 
 PROG = "check_fbc_opt_in.py"
 
diff --git a/scripts/python/tasks/internal/tests/__init__.py b/scripts/python/tasks/internal/tests/__init__.py
diff --git a/scripts/python/tasks/internal/tests/test_check_embargoed_cves.py b/scripts/python/tasks/internal/tests/test_check_embargoed_cves.py
@@ -8,10 +8,10 @@
 from pathlib import Path
 from unittest import mock
 
-import check_embargoed_cves
-import file
-import pytest
-import tekton
+from release_service_utils.tasks.internal mport check_embargoed_cves
+from release_service_utils.helpers import file
+from release_service_utils.helpers import pytest
+from release_service_utils.helpers import tekton
 
 
 def _write_service_account(
diff --git a/scripts/python/tasks/internal/tests/test_check_fbc_opt_in.py b/scripts/python/tasks/internal/tests/test_check_fbc_opt_in.py
@@ -8,11 +8,12 @@
 from pathlib import Path
 from unittest import mock
 
-import check_fbc_opt_in
 import pytest
 import requests
 import tekton
 
+import release_service_utils.tasks.internal.check_fbc_opt_in as check_fbc_opt_in
+
 
 def _write_service_account(
     d: Path, principal: str = "user@REALM", keytab: bytes = b"kt"
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Release Service Utils Python Package."""`