Release 2.13.3

since builder intro the triggers are called with merged result, thus it
would lead to duplicated callouts

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.13.0
+pkgver=2.13.3
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

package/share/ahriman/templates/build-status.jinja2

@@ -15,7 +15,7 @@
 
         <div class="container">
             <nav class="navbar navbar-expand-lg">
-                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""> ahriman</div>
+                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""></div>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar-supported-content" aria-controls="repositories-navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>

package/share/man/man1/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2024\-01\-05" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2024\-01\-12" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS

src/ahriman/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.13.0"
+__version__ = "2.13.3"

src/ahriman/application/application/application_repository.py

@@ -163,8 +163,8 @@ class ApplicationRepository(ApplicationProperties):
         built_packages = self.repository.packages_built()
         if built_packages:  # speedup a bit
             build_result = self.repository.process_update(built_packages, packagers)
+            self.on_result(build_result)
             result.merge(build_result)
-            self.on_result(result.merge(build_result))
 
         builder = Updater.load(self.repository_id, self.configuration, self.repository)
 
@@ -173,7 +173,8 @@ class ApplicationRepository(ApplicationProperties):
         for num, partition in enumerate(partitions):
             self.logger.info("processing chunk #%i %s", num, [package.base for package in partition])
             build_result = builder.update(partition, packagers, bump_pkgrel=bump_pkgrel)
-            self.on_result(result.merge(build_result))
+            self.on_result(build_result)
+            result.merge(build_result)
 
         return result
 

src/ahriman/core/status/watcher.py

@@ -190,7 +190,8 @@ class Watcher(LazyLogging):
         Returns:
             list[PkgbuildPatch]: list of patches which are stored for the package
         """
-        self.package_get(package_base)
+        # patches are package base based, we don't know (and don't differentiate) to which package does them belong
+        # so here we skip checking if package exists or not
         variables = [variable] if variable is not None else None
         return self.database.patches_list(package_base, variables).get(package_base, [])
 

src/ahriman/web/views/v1/status/patch.py

@@ -21,7 +21,6 @@ import aiohttp_apispec  # type: ignore[import-untyped]
 
 from aiohttp.web import HTTPNoContent, HTTPNotFound, Response, json_response
 
-from ahriman.core.exceptions import UnknownPackageError
 from ahriman.models.user_access import UserAccess
 from ahriman.web.schemas import AuthSchema, ErrorSchema, PatchNameSchema, PatchSchema
 from ahriman.web.views.base import BaseView
@@ -76,7 +75,7 @@ class PatchView(StatusViewGuard, BaseView):
             200: {"description": "Success response", "schema": PatchSchema},
             401: {"description": "Authorization required", "schema": ErrorSchema},
             403: {"description": "Access is forbidden", "schema": ErrorSchema},
-            404: {"description": "Package base and/or patch name are unknown", "schema": ErrorSchema},
+            404: {"description": "Patch name is unknown", "schema": ErrorSchema},
             500: {"description": "Internal server error", "schema": ErrorSchema},
         },
         security=[{"token": [GET_PERMISSION]}],
@@ -91,15 +90,12 @@ class PatchView(StatusViewGuard, BaseView):
             Response: 200 with package patch on success
 
         Raises:
-            HTTPNotFound: if package base is unknown
+            HTTPNotFound: if package patch is unknown
         """
         package_base = self.request.match_info["package"]
         variable = self.request.match_info["patch"]
 
-        try:
         patches = self.service().patches_get(package_base, variable)
-        except UnknownPackageError:
-            raise HTTPNotFound(reason=f"Package {package_base} is unknown")
 
         selected = next((patch for patch in patches if patch.key == variable), None)
         if selected is None:

src/ahriman/web/views/v1/status/patches.py

@@ -19,9 +19,8 @@
 #
 import aiohttp_apispec  # type: ignore[import-untyped]
 
-from aiohttp.web import HTTPBadRequest, HTTPNoContent, HTTPNotFound, Response, json_response
+from aiohttp.web import HTTPBadRequest, HTTPNoContent, Response, json_response
 
-from ahriman.core.exceptions import UnknownPackageError
 from ahriman.models.pkgbuild_patch import PkgbuildPatch
 from ahriman.models.user_access import UserAccess
 from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNameSchema, PatchSchema
@@ -50,7 +49,6 @@ class PatchesView(StatusViewGuard, BaseView):
             200: {"description": "Success response", "schema": PatchSchema(many=True)},
             401: {"description": "Authorization required", "schema": ErrorSchema},
             403: {"description": "Access is forbidden", "schema": ErrorSchema},
-            404: {"description": "Package base is unknown", "schema": ErrorSchema},
             500: {"description": "Internal server error", "schema": ErrorSchema},
         },
         security=[{"token": [GET_PERMISSION]}],
@@ -63,15 +61,9 @@ class PatchesView(StatusViewGuard, BaseView):
 
         Returns:
             Response: 200 with package patches on success
-
-        Raises:
-            HTTPNotFound: if package base is unknown
         """
         package_base = self.request.match_info["package"]
-        try:
         patches = self.service().patches_get(package_base, None)
-        except UnknownPackageError:
-            raise HTTPNotFound(reason=f"Package {package_base} is unknown")
 
         response = [patch.view() for patch in patches]
         return json_response(response)

tests/ahriman/core/status/test_watcher.py

@@ -212,14 +212,6 @@ def test_patches_get(watcher: Watcher, package_ahriman: Package, mocker: MockerF
     ])
 
 
-def test_patches_get_failed(watcher: Watcher, package_ahriman: Package) -> None:
-    """
-    must raise UnknownPackageError on patches in case of unknown package
-    """
-    with pytest.raises(UnknownPackageError):
-        watcher.patches_get(package_ahriman.base, None)
-
-
 def test_patches_remove(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must remove patches for the package

tests/ahriman/web/views/v1/status/test_view_v1_status_patch.py

@@ -70,17 +70,6 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None:
     assert patches == patch.view()
 
 
-async def test_get_not_found(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must return not found for missing package
-    """
-    response_schema = pytest.helpers.schema_response(PatchView.get, code=404)
-
-    response = await client.get(f"/api/v1/packages/{package_ahriman.base}/patches/random")
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())
-
-
 async def test_get_patch_not_found(client: TestClient, package_ahriman: Package) -> None:
     """
     must return not found for missing patch

tests/ahriman/web/views/v1/status/test_view_v1_status_patches.py

@@ -46,17 +46,6 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None:
     assert patches == [patch.view()]
 
 
-async def test_get_not_found(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must return not found for missing package
-    """
-    response_schema = pytest.helpers.schema_response(PatchesView.get, code=404)
-
-    response = await client.get(f"/api/v1/packages/{package_ahriman.base}/patches")
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())
-
-
 async def test_post(client: TestClient, package_ahriman: Package) -> None:
     """
     must create patch

tox.ini

@@ -74,6 +74,8 @@ depends =
 	docs
 allowlist_externals =
 	git
+passenv =
+	SSH_AUTH_SOCK
 commands =
 	git add package/archlinux/PKGBUILD src/ahriman/__init__.py docs/ahriman-architecture.svg package/share/man/man1/ahriman.1 package/share/bash-completion/completions/_ahriman package/share/zsh/site-functions/_ahriman
 	git commit -m "Release {posargs}"