make apispec dependency optional

.pylintrc

@@ -305,7 +305,7 @@ max-branches=12
 max-locals=15
 
 # Maximum number of parents for a class (see R0901).
-max-parents=15
+max-parents=7
 
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20

CONTRIBUTING.md

@@ -175,10 +175,11 @@ Again, the most checks can be performed by `tox` command, though some additional
 * Web API methods must be documented by using `aiohttp_apispec` library. The schema testing mostly should be implemented in related view class tests. Recommended example for documentation (excluding comments):
 
     ```python
+    import aiohttp_apispec
+
     from marshmallow import Schema, fields  
 
-    from ahriman.web.apispec.decorators import apidocs
+    from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNameSchema, PaginationSchema
-    from ahriman.web.schemas import PackageNameSchema, PaginationSchema
     from ahriman.web.views.base import BaseView
 
 
@@ -197,17 +198,25 @@ Again, the most checks can be performed by `tox` command, though some additional
         POST_PERMISSION = ...
         ROUTES = ...
 
-        @apidocs(
+        @aiohttp_apispec.docs(
             tags=["Tag"],
             summary="Do foo",
             description="Extended description of the method which does foo",
-            error_400_enabled=True,  # exception raised by this method
+            responses={
-            error_404_description="Repository is unknown",
+                200: {"description": "Success response", "schema": ResponseSchema},
-            schema=ResponseSchema,  # leave empty if no responses here
+                204: {"description": "Success response"},  # example without json schema response
-            match_schema=PackageNameSchema,
+                400: {"description": "Bad data is supplied", "schema": ErrorSchema},  # exception raised by this method
-            query_schema=PaginationSchema,
+                401: {"description": "Authorization required", "schema": ErrorSchema},  # should be always presented
-            body_schema=RequestSchema(many=True),
+                403: {"description": "Access is forbidden", "schema": ErrorSchema},  # should be always presented
+                404: {"description": "Repository is unknown", "schema": ErrorSchema},  # include if BaseView.service() method is called
+                500: {"description": "Internal server error", "schema": ErrorSchema},  # should be always presented
+            },
+            security=[{"token": [POST_PERMISSION]}],
         )
+        @aiohttp_apispec.cookies_schema(AuthSchema)  # should be always presented
+        @aiohttp_apispec.match_info_schema(PackageNameSchema)
+        @aiohttp_apispec.querystring_schema(PaginationSchema)
+        @aiohttp_apispec.json_schema(RequestSchema(many=True))
         async def post(self) -> None: ...
     ```
 

docker/Dockerfile

@@ -108,7 +108,9 @@ RUN cp "/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist.orig" && \
     sed -i "s/SigLevel *=.*/SigLevel = Optional/g" "/etc/pacman.conf" && \
     pacman -Sy
 ## install package and its optional dependencies
-RUN pacman -S --noconfirm ahriman
+RUN pacman -S --noconfirm \
+        --assume-installed python-aiohttp-apispec=3.0.0 \
+        ahriman
 RUN pacman -S --noconfirm --asdeps \
         python-aioauth-client \
         python-aiohttp-apispec-git \

docs/ahriman.web.apispec.rst

@@ -1,29 +0,0 @@
-ahriman.web.apispec package
-===========================
-
-Submodules
-----------
-
-ahriman.web.apispec.decorators module
--------------------------------------
-
-.. automodule:: ahriman.web.apispec.decorators
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.apispec.info module
--------------------------------
-
-.. automodule:: ahriman.web.apispec.info
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.web.apispec
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.web.rst

@@ -7,7 +7,6 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   ahriman.web.apispec
    ahriman.web.middlewares
    ahriman.web.schemas
    ahriman.web.views
@@ -15,6 +14,14 @@ Subpackages
 Submodules
 ----------
 
+ahriman.web.apispec module
+--------------------------
+
+.. automodule:: ahriman.web.apispec
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.cors module
 -----------------------
 

package/archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.17.2
+pkgver=2.16.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

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

@@ -119,9 +119,7 @@
                     <li><a id="badge-version" class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources"><i class="bi bi-github"></i> ahriman</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/releases" title="releases list">releases</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/issues" title="issues tracker">report a bug</a></li>
-                    {% if docs_enabled %}
                     <li><a class="nav-link" href="/api-docs" title="API documentation">api</a></li>
-                    {% endif %}
                 </ul>
 
                 {% if index_url is not none %}

package/share/bash-completion/completions/_ahriman

@@ -64,10 +64,10 @@ _shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
 _shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
 _shtab_ahriman_service_run_option_strings=('-h' '--help')
 _shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_service_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_service_shell_option_strings=('-h' '--help')
 _shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
 _shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_shell_option_strings=('-h' '--help')
 _shtab_ahriman_sign_option_strings=('-h' '--help')
 _shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
 _shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')

package/share/man/man1/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2025\-02\-23" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2024\-12\-01" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS
@@ -940,7 +940,7 @@ port of the web service
 path to unix socket used for interprocess communications
 
 .SH COMMAND \fI\,'ahriman service\-shell'\/\fR
-usage: ahriman service\-shell [\-h] [\-o OUTPUT] [code]
+usage: ahriman service\-shell [\-h] [code]
 
 drop into python shell
 
@@ -948,11 +948,6 @@ drop into python shell
 \fBcode\fR
 instead of dropping into shell, just execute the specified code
 
-.SH OPTIONS \fI\,'ahriman service\-shell'\/\fR
-.TP
-\fB\-o\fR \fI\,OUTPUT\/\fR, \fB\-\-output\fR \fI\,OUTPUT\/\fR
-output commands and result to the file
-
 .SH COMMAND \fI\,'ahriman service\-tree\-migrate'\/\fR
 usage: ahriman service\-tree\-migrate [\-h]
 

package/share/zsh/site-functions/_ahriman

@@ -583,7 +583,6 @@ _shtab_ahriman_service_setup_options=(
 
 _shtab_ahriman_service_shell_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
   ":instead of dropping into shell, just execute the specified code (default\: None):"
 )
 
@@ -609,7 +608,6 @@ _shtab_ahriman_setup_options=(
 
 _shtab_ahriman_shell_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
   ":instead of dropping into shell, just execute the specified code (default\: None):"
 )
 

src/ahriman/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -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.17.2"
+__version__ = "2.16.0"

src/ahriman/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/ahriman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_packages.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_properties.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_repository.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/updates_iterator.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/local_updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/remote_updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/add.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/backup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/change.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/clean.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/copy.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/daemon.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/dump.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/handler.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/help.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/key_import.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/patch.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/rebuild.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove_unknown.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/repositories.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/restore.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/run.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/search.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/service_updates.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/setup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/shell.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/sign.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/statistics.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/status.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/status_update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/structure.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/tree_migrate.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/triggers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/triggers_support.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/unsafe_commands.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/users.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/validate.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/versions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/web.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/help_formatter.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/interactive_shell.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -18,7 +18,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from code import InteractiveConsole
-from importlib.util import find_spec
 from typing import Any
 
 
@@ -27,19 +26,6 @@ class InteractiveShell(InteractiveConsole):
     wrapper around :class:`code.InteractiveConsole` to pass :func:`interact()` to IPython shell
     """
 
-    @staticmethod
-    def has_ipython() -> bool:
-        """
-        check if IPython shell is available
-
-        Returns:
-            bool: ``True`` if IPython shell is available, ``False`` otherwise
-        """
-        try:
-            return find_spec("IPython.terminal.embed") is not None
-        except ModuleNotFoundError:
-            return False
-
     def interact(self, *args: Any, **kwargs: Any) -> None:
         """
         pass controller to IPython shell
@@ -48,13 +34,13 @@ class InteractiveShell(InteractiveConsole):
             *args(Any): positional arguments
             **kwargs(Any): keyword arguments
         """
-        if self.has_ipython():
+        try:
             from IPython.terminal.embed import InteractiveShellEmbed
 
             shell = InteractiveShellEmbed(user_ns=self.locals)  # type: ignore[no-untyped-call]
             shell.show_banner()  # type: ignore[no-untyped-call]
             shell.interact()  # type: ignore[no-untyped-call]
-        else:
+        except ImportError:
             # fallback to default
             import readline  # pylint: disable=unused-import
             InteractiveConsole.interact(self, *args, **kwargs)

src/ahriman/application/lock.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/pacman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/pacman_database.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/pkgbuild_parser.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -41,7 +41,6 @@ class PkgbuildToken(StrEnum):
         FunctionDeclaration(PkgbuildToken): (class attribute) function declaration token
         FunctionEnds(PkgbuildToken): (class attribute) function ends token
         FunctionStarts(PkgbuildToken): (class attribute) function starts token
-        NewLine(PkgbuildToken): (class attribute) new line token
     """
 
     ArrayStarts = "("
@@ -55,8 +54,6 @@ class PkgbuildToken(StrEnum):
     FunctionStarts = "{"
     FunctionEnds = "}"
 
-    NewLine = "\n"
-
 
 class PkgbuildParser(shlex.shlex):
     """
@@ -177,18 +174,31 @@ class PkgbuildParser(shlex.shlex):
         Returns:
             bool: ``True`` if the previous element of the stream is a quote or escaped and ``False`` otherwise
         """
+        # wrapper around reading utf symbols from random position of the stream
+        def read_last() -> tuple[int, str]:
+            while (position := self._io.tell()) > 0:
+                try:
+                    return position, self._io.read(1)
+                except UnicodeDecodeError:
+                    self._io.seek(position - 1)
+
+            raise PkgbuildParserError("reached starting position, no valid symbols found")
+
         current_position = self._io.tell()
 
         last_char = penultimate_char = None
         index = current_position - 1
         while index > 0:
-            index, last_char = self._read_last(index)
+            self._io.seek(index)
+
+            index, last_char = read_last()
             if last_char.isspace():
                 index -= 1
                 continue
 
             if index > 1:
-                _, penultimate_char = self._read_last(index - 1)
+                self._io.seek(index - 1)
+                _, penultimate_char = read_last()
 
             break
 
@@ -217,7 +227,7 @@ class PkgbuildParser(shlex.shlex):
                     case PkgbuildToken.ArrayEnds:
                         break
                     case comment if comment.startswith(PkgbuildToken.Comment):
-                        self._read_comment()
+                        self.instream.readline()
                         continue
 
                 yield token
@@ -258,7 +268,7 @@ class PkgbuildParser(shlex.shlex):
                     if counter == 0:
                         break
                 case comment if comment.startswith(PkgbuildToken.Comment):
-                    self._read_comment()
+                    self.instream.readline()
 
         if not 0 < start_position < end_position:
             raise PkgbuildParserError("function body wasn't found")
@@ -294,7 +304,7 @@ class PkgbuildParser(shlex.shlex):
             return
 
         if token.startswith(PkgbuildToken.Comment):
-            self._read_comment()
+            self.instream.readline()
             return
 
         match self.get_token():
@@ -322,44 +332,6 @@ class PkgbuildParser(shlex.shlex):
             case other if other is not None:
                 yield from self._parse_token(other)
 
-    def _read_comment(self) -> None:
-        """
-        read comment from the current position. This method doesn't check comment itself, just read the stream
-        until the comment line ends
-        """
-        _, last_symbol = self._read_last()
-        if last_symbol != PkgbuildToken.NewLine:
-            self.instream.readline()
-
-    def _read_last(self, initial_index: int | None = None) -> tuple[int, str]:
-        """
-        wrapper around read to read the last symbol from the input stream. This method is designed to process UTF-8
-        symbols correctly. This method does not reset current stream position
-
-        Args:
-            initial_index(int | None, optional): initial index to start reading from. If none set, the previous position
-                will be used (Default value = None)
-
-        Returns:
-            tuple[int, str]: last symbol and its position in the stream
-
-        Raises:
-            PkgbuildParserError: in case if stream reached starting position, but no valid symbols were found
-        """
-        if initial_index is None:
-            initial_index = self._io.tell() - 1
-        if initial_index < 0:
-            raise PkgbuildParserError("stream is on starting position")
-        self._io.seek(initial_index)
-
-        while (position := self._io.tell()) > 0:
-            try:
-                return position, self._io.read(1)
-            except UnicodeDecodeError:
-                self._io.seek(position - 1)
-
-        raise PkgbuildParserError("reached starting position, no valid symbols found")
-
     def parse(self) -> Generator[PkgbuildPatch, None, None]:
         """
         parse source stream and yield parsed entries

src/ahriman/core/alpm/remote/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/remote/aur.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/remote/official.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/remote/official_syncdb.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/remote/remote.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/repo.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/auth.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/helpers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,9 @@
 #
 try:
     import aiohttp_security
+    _has_aiohttp_security = True
 except ImportError:
-    aiohttp_security = None  # type: ignore[assignment]
+    _has_aiohttp_security = False
 
 from typing import Any
 
@@ -39,7 +40,7 @@ async def authorized_userid(*args: Any, **kwargs: Any) -> Any:
     Returns:
         Any: ``None`` in case if no aiohttp_security module found and function call otherwise
     """
-    if aiohttp_security is not None:
+    if _has_aiohttp_security:
         return await aiohttp_security.authorized_userid(*args, **kwargs)  # pylint: disable=no-value-for-parameter
     return None
 
@@ -55,7 +56,7 @@ async def check_authorized(*args: Any, **kwargs: Any) -> Any:
     Returns:
         Any: ``None`` in case if no aiohttp_security module found and function call otherwise
     """
-    if aiohttp_security is not None:
+    if _has_aiohttp_security:
         return await aiohttp_security.check_authorized(*args, **kwargs)  # pylint: disable=no-value-for-parameter
     return None
 
@@ -71,7 +72,7 @@ async def forget(*args: Any, **kwargs: Any) -> Any:
     Returns:
         Any: ``None`` in case if no aiohttp_security module found and function call otherwise
     """
-    if aiohttp_security is not None:
+    if _has_aiohttp_security:
         return await aiohttp_security.forget(*args, **kwargs)  # pylint: disable=no-value-for-parameter
     return None
 
@@ -87,6 +88,6 @@ async def remember(*args: Any, **kwargs: Any) -> Any:
     Returns:
         Any: ``None`` in case if no aiohttp_security module found and function call otherwise
     """
-    if aiohttp_security is not None:
+    if _has_aiohttp_security:
         return await aiohttp_security.remember(*args, **kwargs)  # pylint: disable=no-value-for-parameter
     return None

src/ahriman/core/auth/mapping.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/oauth.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/pam.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/build_tools/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/build_tools/package_archive.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -136,7 +136,7 @@ class PackageArchive:
         dependencies, roots = self.depends_on_paths()
         installed_packages = self.installed_packages()
         # build list of packages, which contains both the package itself and (possible) debug packages
-        packages = list(self.package.packages) + [f"{self.package.base}-debug"]
+        packages = list(self.package.packages) + [f"{package}-debug" for package in self.package.packages]
 
         # build initial map of file path -> packages containing this path
         # in fact, keys will contain all libraries the package linked to and all directories it contains

src/ahriman/core/build_tools/sources.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/build_tools/task.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -149,11 +149,8 @@ class Task(LazyLogging):
             str | None: current commit sha if available
         """
         last_commit_sha = Sources.load(sources_dir, self.package, patches, self.paths)
-        if self.package.is_vcs:  # if package is VCS, then make sure to update PKGBUILD to the latest version
+        if local_version is None:
-            self.build(sources_dir, dry_run=True)
+            return last_commit_sha  # there is no local package or pkgrel increment is disabled
-
-        if local_version is None:  # there is no local package or pkgrel increment is disabled
-            return last_commit_sha
 
         # load fresh package
         loaded_package = Package.from_build(sources_dir, self.architecture, None)

src/ahriman/core/configuration/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/configuration.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/configuration_multi_dict.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -57,7 +57,7 @@ class ConfigurationMultiDict(dict[str, Any]):
             OptionError: if the key already exists in the dictionary, but not a single value list or a string
         """
         match self.get(key):
-            case [current_value] | str(current_value):
+            case [current_value] | str(current_value):  # type: ignore[misc]
                 value = f"{current_value} {value}"
             case None:
                 pass

src/ahriman/core/configuration/schema.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/shell_interpolator.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/shell_template.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/validator.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m000_initial.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m001_package_source.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m002_user_access.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m003_patch_variables.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m004_logs.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m005_make_opt_depends.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m006_packages_architecture_required.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).