diff --git a/docs/ahriman.web.views.v1.packages.rst b/docs/ahriman.web.views.v1.packages.rst new file mode 100644 index 00000000..40364345 --- /dev/null +++ b/docs/ahriman.web.views.v1.packages.rst @@ -0,0 +1,61 @@ +ahriman.web.views.v1.packages package +===================================== + +Submodules +---------- + +ahriman.web.views.v1.packages.changes module +-------------------------------------------- + +.. automodule:: ahriman.web.views.v1.packages.changes + :members: + :no-undoc-members: + :show-inheritance: + +ahriman.web.views.v1.packages.logs module +----------------------------------------- + +.. automodule:: ahriman.web.views.v1.packages.logs + :members: + :no-undoc-members: + :show-inheritance: + +ahriman.web.views.v1.packages.package module +-------------------------------------------- + +.. automodule:: ahriman.web.views.v1.packages.package + :members: + :no-undoc-members: + :show-inheritance: + +ahriman.web.views.v1.packages.packages module +--------------------------------------------- + +.. automodule:: ahriman.web.views.v1.packages.packages + :members: + :no-undoc-members: + :show-inheritance: + +ahriman.web.views.v1.packages.patch module +------------------------------------------ + +.. automodule:: ahriman.web.views.v1.packages.patch + :members: + :no-undoc-members: + :show-inheritance: + +ahriman.web.views.v1.packages.patches module +-------------------------------------------- + +.. automodule:: ahriman.web.views.v1.packages.patches + :members: + :no-undoc-members: + :show-inheritance: + +Module contents +--------------- + +.. automodule:: ahriman.web.views.v1.packages + :members: + :no-undoc-members: + :show-inheritance: diff --git a/docs/ahriman.web.views.v1.rst b/docs/ahriman.web.views.v1.rst index 27c53c84..d484c6c8 100644 --- a/docs/ahriman.web.views.v1.rst +++ b/docs/ahriman.web.views.v1.rst @@ -8,6 +8,7 @@ Subpackages :maxdepth: 4 ahriman.web.views.v1.distributed + ahriman.web.views.v1.packages ahriman.web.views.v1.service ahriman.web.views.v1.status ahriman.web.views.v1.user diff --git a/docs/ahriman.web.views.v1.status.rst b/docs/ahriman.web.views.v1.status.rst index e5cced9e..694f4159 100644 --- a/docs/ahriman.web.views.v1.status.rst +++ b/docs/ahriman.web.views.v1.status.rst @@ -4,14 +4,6 @@ ahriman.web.views.v1.status package Submodules ---------- -ahriman.web.views.v1.status.changes module ------------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.changes - :members: - :no-undoc-members: - :show-inheritance: - ahriman.web.views.v1.status.info module --------------------------------------- @@ -20,46 +12,6 @@ ahriman.web.views.v1.status.info module :no-undoc-members: :show-inheritance: -ahriman.web.views.v1.status.logs module ---------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.logs - :members: - :no-undoc-members: - :show-inheritance: - -ahriman.web.views.v1.status.package module ------------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.package - :members: - :no-undoc-members: - :show-inheritance: - -ahriman.web.views.v1.status.packages module -------------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.packages - :members: - :no-undoc-members: - :show-inheritance: - -ahriman.web.views.v1.status.patch module ----------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.patch - :members: - :no-undoc-members: - :show-inheritance: - -ahriman.web.views.v1.status.patches module ------------------------------------------- - -.. automodule:: ahriman.web.views.v1.status.patches - :members: - :no-undoc-members: - :show-inheritance: - ahriman.web.views.v1.status.repositories module ----------------------------------------------- diff --git a/docs/ahriman.web.views.v2.packages.rst b/docs/ahriman.web.views.v2.packages.rst new file mode 100644 index 00000000..9793b8df --- /dev/null +++ b/docs/ahriman.web.views.v2.packages.rst @@ -0,0 +1,21 @@ +ahriman.web.views.v2.packages package +===================================== + +Submodules +---------- + +ahriman.web.views.v2.packages.logs module +----------------------------------------- + +.. automodule:: ahriman.web.views.v2.packages.logs + :members: + :no-undoc-members: + :show-inheritance: + +Module contents +--------------- + +.. automodule:: ahriman.web.views.v2.packages + :members: + :no-undoc-members: + :show-inheritance: diff --git a/docs/ahriman.web.views.v2.rst b/docs/ahriman.web.views.v2.rst index fece3d4b..0d06409a 100644 --- a/docs/ahriman.web.views.v2.rst +++ b/docs/ahriman.web.views.v2.rst @@ -7,7 +7,7 @@ Subpackages .. toctree:: :maxdepth: 4 - ahriman.web.views.v2.status + ahriman.web.views.v2.packages Module contents --------------- diff --git a/docs/ahriman.web.views.v2.status.rst b/docs/ahriman.web.views.v2.status.rst deleted file mode 100644 index 1d777ebb..00000000 --- a/docs/ahriman.web.views.v2.status.rst +++ /dev/null @@ -1,21 +0,0 @@ -ahriman.web.views.v2.status package -=================================== - -Submodules ----------- - -ahriman.web.views.v2.status.logs module ---------------------------------------- - -.. automodule:: ahriman.web.views.v2.status.logs - :members: - :no-undoc-members: - :show-inheritance: - -Module contents ---------------- - -.. automodule:: ahriman.web.views.v2.status - :members: - :no-undoc-members: - :show-inheritance: diff --git a/src/ahriman/web/views/v2/status/__init__.py b/src/ahriman/web/views/v1/packages/__init__.py similarity index 100% rename from src/ahriman/web/views/v2/status/__init__.py rename to src/ahriman/web/views/v1/packages/__init__.py diff --git a/src/ahriman/web/views/v1/status/changes.py b/src/ahriman/web/views/v1/packages/changes.py similarity index 100% rename from src/ahriman/web/views/v1/status/changes.py rename to src/ahriman/web/views/v1/packages/changes.py diff --git a/src/ahriman/web/views/v1/status/logs.py b/src/ahriman/web/views/v1/packages/logs.py similarity index 100% rename from src/ahriman/web/views/v1/status/logs.py rename to src/ahriman/web/views/v1/packages/logs.py diff --git a/src/ahriman/web/views/v1/status/package.py b/src/ahriman/web/views/v1/packages/package.py similarity index 100% rename from src/ahriman/web/views/v1/status/package.py rename to src/ahriman/web/views/v1/packages/package.py diff --git a/src/ahriman/web/views/v1/status/packages.py b/src/ahriman/web/views/v1/packages/packages.py similarity index 100% rename from src/ahriman/web/views/v1/status/packages.py rename to src/ahriman/web/views/v1/packages/packages.py diff --git a/src/ahriman/web/views/v1/status/patch.py b/src/ahriman/web/views/v1/packages/patch.py similarity index 100% rename from src/ahriman/web/views/v1/status/patch.py rename to src/ahriman/web/views/v1/packages/patch.py diff --git a/src/ahriman/web/views/v1/status/patches.py b/src/ahriman/web/views/v1/packages/patches.py similarity index 100% rename from src/ahriman/web/views/v1/status/patches.py rename to src/ahriman/web/views/v1/packages/patches.py diff --git a/src/ahriman/web/views/v2/packages/__init__.py b/src/ahriman/web/views/v2/packages/__init__.py new file mode 100644 index 00000000..78e01321 --- /dev/null +++ b/src/ahriman/web/views/v2/packages/__init__.py @@ -0,0 +1,19 @@ +# +# Copyright (c) 2021-2024 ahriman team. +# +# This file is part of ahriman +# (see https://github.com/arcan1s/ahriman). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# diff --git a/src/ahriman/web/views/v2/status/logs.py b/src/ahriman/web/views/v2/packages/logs.py similarity index 100% rename from src/ahriman/web/views/v2/status/logs.py rename to src/ahriman/web/views/v2/packages/logs.py diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_changes.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py similarity index 98% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_changes.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py index cfb56b97..f747e172 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_changes.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py @@ -6,7 +6,7 @@ from ahriman.models.build_status import BuildStatusEnum from ahriman.models.changes import Changes from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.changes import ChangesView +from ahriman.web.views.v1.packages.changes import ChangesView async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_logs.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py similarity index 98% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_logs.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py index 8759b53f..8c220f0d 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_logs.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py @@ -5,7 +5,7 @@ from aiohttp.test_utils import TestClient from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.logs import LogsView +from ahriman.web.views.v1.packages.logs import LogsView async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_package.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py similarity index 99% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_package.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py index abf8e602..dd8dee4d 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_package.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py @@ -6,7 +6,7 @@ from ahriman.models.build_status import BuildStatus, BuildStatusEnum from ahriman.models.package import Package from ahriman.models.repository_id import RepositoryId from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.package import PackageView +from ahriman.web.views.v1.packages.package import PackageView async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_packages.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py similarity index 98% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_packages.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py index 1718cddb..7242c65e 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_packages.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py @@ -6,7 +6,7 @@ from pytest_mock import MockerFixture from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.packages import (PackagesView) +from ahriman.web.views.v1.packages.packages import (PackagesView) async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_patch.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py similarity index 98% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_patch.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py index 147b4b28..90805bd6 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_patch.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py @@ -6,7 +6,7 @@ from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.pkgbuild_patch import PkgbuildPatch from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.patch import PatchView +from ahriman.web.views.v1.packages.patch import PatchView async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v1/status/test_view_v1_status_patches.py b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py similarity index 97% rename from tests/ahriman/web/views/v1/status/test_view_v1_status_patches.py rename to tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py index b1279c71..fee9bc0f 100644 --- a/tests/ahriman/web/views/v1/status/test_view_v1_status_patches.py +++ b/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py @@ -6,7 +6,7 @@ from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.pkgbuild_patch import PkgbuildPatch from ahriman.models.user_access import UserAccess -from ahriman.web.views.v1.status.patches import PatchesView +from ahriman.web.views.v1.packages.patches import PatchesView async def test_get_permission() -> None: diff --git a/tests/ahriman/web/views/v2/status/test_view_v2_status_logs.py b/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py similarity index 98% rename from tests/ahriman/web/views/v2/status/test_view_v2_status_logs.py rename to tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py index cfc7ad42..6f03d698 100644 --- a/tests/ahriman/web/views/v2/status/test_view_v2_status_logs.py +++ b/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py @@ -5,7 +5,7 @@ from aiohttp.test_utils import TestClient from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.views.v2.status.logs import LogsView +from ahriman.web.views.v2.packages.logs import LogsView async def test_get_permission() -> None: