.github/workflows/run-setup.yml

@@ -7,22 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-  run-setup-minimal:
-
-    runs-on: ubuntu-latest
-
-    container:
-      image: archlinux:latest
-      volumes:
-        - ${{ github.workspace }}:/build
-      options: --privileged -w /build
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: setup the minimal service in arch linux container
-        run: .github/workflows/setup.sh minimal
-
   run-setup:
 
     runs-on: ubuntu-latest

.github/workflows/setup.sh

@@ -3,8 +3,6 @@
 
 set -ex
 
-[[ $1 = "minimal" ]] && MINIMAL_INSTALL=1
-
 # install dependencies
 echo -e '[arcanisrepo]\nServer = http://repo.arcanis.me/$arch\nSigLevel = Never' | tee -a /etc/pacman.conf
 # refresh the image
@@ -14,14 +12,12 @@ pacman --noconfirm -Sy base-devel devtools git pyalpm python-aur python-passlib
 # make dependencies
 pacman --noconfirm -Sy python-build python-installer python-wheel
 # optional dependencies
-if [[ -z $MINIMAL_INSTALL ]]; then
+# VCS support
-    # VCS support
+pacman --noconfirm -Sy breezy darcs mercurial subversion
-    pacman --noconfirm -Sy breezy darcs mercurial subversion
+# web server
-    # web server
+pacman --noconfirm -Sy python-aioauth-client python-aiohttp python-aiohttp-debugtoolbar python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
-    pacman --noconfirm -Sy python-aioauth-client python-aiohttp python-aiohttp-debugtoolbar python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
+# additional features
-    # additional features
+pacman --noconfirm -Sy gnupg python-boto3 rsync
-    pacman --noconfirm -Sy gnupg python-boto3 rsync
-fi
 
 # create fresh tarball
 make VERSION=1.0.0 archlinux  # well, it does not really matter which version we will put here
@@ -37,17 +33,14 @@ systemd-machine-id-setup
 # special thing for the container, because /dev/log interface is not available there
 sed -i "s/handlers = syslog_handler/handlers = console_handler/g" /etc/ahriman.ini.d/logging.ini
 # initial setup command as root
-[[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
+ahriman -a x86_64 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" --web-port 8080
-ahriman -a x86_64 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
 # enable services
 systemctl enable ahriman-web@x86_64
 systemctl enable ahriman@x86_64.timer
-if [[ -z $MINIMAL_INSTALL ]]; then
+# run web service (detached)
-    # run web service (detached)
+sudo -u ahriman -- ahriman -a x86_64 web &
-    sudo -u ahriman -- ahriman -a x86_64 web &
+WEBPID=$!
-    WEB_PID=$!
+sleep 15s  # wait for the web service activation
-    sleep 15s  # wait for the web service activation
-fi
 # add the first package
 # the build itself does not really work in the container
 sudo -u ahriman -- ahriman package-add --now yay
@@ -56,4 +49,4 @@ sudo -u ahriman -- ahriman package-add --now yay
 # run package check
 sudo -u ahriman -- ahriman repo-update
 # stop web service lol
-[[ -z $WEB_PID ]] || kill $WEB_PID
+kill $WEBPID

src/ahriman/core/database/operations/operations.py

@@ -20,6 +20,7 @@
 import sqlite3
 
 from pathlib import Path
+from sqlite3 import Connection, Cursor
 from typing import Any, Dict, Tuple, TypeVar, Callable
 
 from ahriman.core.lazy_logging import LazyLogging
@@ -45,7 +46,7 @@ class Operations(LazyLogging):
         self.path = path
 
     @staticmethod
-    def factory(cursor: sqlite3.Cursor, row: Tuple[Any, ...]) -> Dict[str, Any]:
+    def factory(cursor: Cursor, row: Tuple[Any, ...]) -> Dict[str, Any]:
         """
         dictionary factory based on official documentation
 
@@ -61,7 +62,7 @@ class Operations(LazyLogging):
             result[column[0]] = row[index]
         return result
 
-    def with_connection(self, query: Callable[[sqlite3.Connection], T], commit: bool = False) -> T:
+    def with_connection(self, query: Callable[[Connection], T], commit: bool = False) -> T:
         """
         perform operation in connection