in-house bytes pkgbuild parser

.github/workflows/docker.yml

@@ -8,10 +8,6 @@ on:
       - '*'
       - '!*rc*'
 
-permissions:
-  contents: read
-  packages: write
-
 jobs:
   docker-image:
 

.github/workflows/regress.yml

@@ -2,9 +2,6 @@ name: Regress
 
 on: workflow_dispatch
 
-permissions:
-  contents: read
-
 jobs:
   run-regress-tests:
 

.github/workflows/release.yml

@@ -5,9 +5,6 @@ on:
     tags:
       - '*'
 
-permissions:
-  contents: write
-
 jobs:
   make-release:
 

.github/workflows/setup.yml

@@ -8,9 +8,6 @@ on:
     branches:
       - master
 
-permissions:
-  contents: read
-
 jobs:
   run-setup-minimal:
 

.github/workflows/tests.yml

@@ -10,9 +10,6 @@ on:
   schedule:
     - cron: 1 0 * * *
 
-permissions:
-  contents: read
-
 jobs:
   run-tests:
 

docs/conf.py

@@ -91,13 +91,7 @@ autoclass_content = "both"
 
 autodoc_member_order = "groupwise"
 
-autodoc_mock_imports = [
+autodoc_mock_imports = ["cryptography", "pyalpm"]
-    "aioauth_client",
-    "aiohttp_security",
-    "aiohttp_session",
-    "cryptography", 
-    "pyalpm",
-]
 
 autodoc_default_options = {
     "no-undoc-members": True,

src/ahriman/core/configuration/shell_interpolator.py

@@ -23,7 +23,7 @@ import sys
 
 from collections.abc import Generator, Mapping, MutableMapping
 from string import Template
-from typing import Any, ClassVar
+from typing import ClassVar
 
 from ahriman.core.configuration.shell_template import ShellTemplate
 
@@ -85,7 +85,7 @@ class ShellInterpolator(configparser.Interpolation):
             "prefix": sys.prefix,
         }
 
-    def before_get(self, parser: MutableMapping[str, Mapping[str, str]], section: Any, option: Any, value: str,
+    def before_get(self, parser: MutableMapping[str, Mapping[str, str]], section: str, option: str, value: str,
                    defaults: Mapping[str, str]) -> str:
         """
         interpolate option value
@@ -100,8 +100,8 @@ class ShellInterpolator(configparser.Interpolation):
 
         Args:
             parser(MutableMapping[str, Mapping[str, str]]): option parser
-            section(Any): section name
+            section(str): section name
-            option(Any): option name
+            option(str): option name
             value(str): source (not-converted) value
             defaults(Mapping[str, str]): default values
 

tests/ahriman/web/conftest.py

@@ -1,8 +1,8 @@
 import pytest
-import pytest_asyncio
 
 from aiohttp.test_utils import TestClient
 from aiohttp.web import Application, Resource, UrlMappingMatchInfo
+from asyncio import BaseEventLoop
 from collections.abc import Awaitable, Callable
 from marshmallow import Schema
 from pytest_mock import MockerFixture
@@ -164,13 +164,15 @@ def application_with_auth(configuration: Configuration, user: User, spawner: Spa
     return application
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
-async def client(application: Application, aiohttp_client: Any, mocker: MockerFixture) -> TestClient:
+def client(application: Application, event_loop: BaseEventLoop, aiohttp_client: Any,
+           mocker: MockerFixture) -> TestClient:
     """
     web client fixture
 
     Args:
         application(Application): application fixture
+        event_loop(BaseEventLoop): context event loop
         aiohttp_client(Any): aiohttp client fixture
         mocker(MockerFixture): mocker object
 
@@ -178,35 +180,37 @@ async def client(application: Application, aiohttp_client: Any, mocker: MockerFi
         TestClient: web client test instance
     """
     mocker.patch("pathlib.Path.iterdir", return_value=[])
-    return await aiohttp_client(application)
+    return event_loop.run_until_complete(aiohttp_client(application))
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
-async def client_with_auth(application_with_auth: Application, aiohttp_client: Any,
+def client_with_auth(application_with_auth: Application, event_loop: BaseEventLoop, aiohttp_client: Any,
+                     mocker: MockerFixture) -> TestClient:
+    """
+    web client fixture with full authorization functions
+
+    Args:
+        application_with_auth(Application): application fixture
+        event_loop(BaseEventLoop): context event loop
+        aiohttp_client(Any): aiohttp client fixture
+        mocker(MockerFixture): mocker object
+
+    Returns:
+        TestClient: web client test instance
+    """
+    mocker.patch("pathlib.Path.iterdir", return_value=[])
+    return event_loop.run_until_complete(aiohttp_client(application_with_auth))
+
+
+@pytest.fixture
+def client_with_oauth_auth(application_with_auth: Application, event_loop: BaseEventLoop, aiohttp_client: Any,
                            mocker: MockerFixture) -> TestClient:
     """
     web client fixture with full authorization functions
 
     Args:
         application_with_auth(Application): application fixture
-        aiohttp_client(Any): aiohttp client fixture
+        event_loop(BaseEventLoop): context event loop
-        mocker(MockerFixture): mocker object
-
-    Returns:
-        TestClient: web client test instance
-    """
-    mocker.patch("pathlib.Path.iterdir", return_value=[])
-    return await aiohttp_client(application_with_auth)
-
-
-@pytest_asyncio.fixture
-async def client_with_oauth_auth(application_with_auth: Application, aiohttp_client: Any,
-                                 mocker: MockerFixture) -> TestClient:
-    """
-    web client fixture with full authorization functions
-
-    Args:
-        application_with_auth(Application): application fixture
         aiohttp_client(Any): aiohttp client fixture
         mocker(MockerFixture): mocker object
 
@@ -215,4 +219,4 @@ async def client_with_oauth_auth(application_with_auth: Application, aiohttp_cli
     """
     mocker.patch("pathlib.Path.iterdir", return_value=[])
     application_with_auth[AuthKey] = MagicMock(spec=OAuth)
-    return await aiohttp_client(application_with_auth)
+    return event_loop.run_until_complete(aiohttp_client(application_with_auth))