move fixtures to __init__.py

.github/scripts/setup.sh

@@ -26,10 +26,10 @@ cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 # create fresh tarball
 tox -e archive
 # run makepkg
-PKGVER=$(python -c "from src.ahriman import __version__; print(__version__)")
-mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux
-chmod +777 package/archlinux  # because fuck you that's why
-cd package/archlinux
+PKGVER=$(PYTHONPATH=ahriman-core/src python -c "from ahriman import __version__; print(__version__)")
+mv "dist/ahriman-$PKGVER.tar.gz" archlinux
+chmod +777 archlinux  # because fuck you that's why
+cd archlinux
 sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
 sudo -u nobody -- makepkg --packagelist | grep "ahriman-core-$PKGVER" | pacman -U --noconfirm --nodeps -
 if [[ -z $MINIMAL_INSTALL ]]; then

.github/workflows/docker.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Set image date
         id: args
-        run: echo "::set-output name=date::$(date -d yesterday +'%Y-%m-%d')"
+        run: echo "date=$(date -d yesterday +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
 
       - name: Login to docker hub
         uses: docker/login-action@v3

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Extract version
         id: version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
 
       - name: Create changelog
         id: changelog
@@ -38,7 +38,7 @@ jobs:
       - name: Create archive
         run: tox -e archive
         env:
-          VERSION: ${{ steps.version.outputs.VERSION }}
+          VERSION: ${{ steps.version.outputs.version }}
 
       - name: Publish release
         uses: softprops/action-gh-release@v2

.github/workflows/setup.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup the minimal service in arch linux container
-        run: .github/workflows/setup.sh minimal
+        run: .github/scripts/setup.sh minimal
 
   run-setup:
 
@@ -43,4 +43,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup the service in arch linux container
-        run: .github/workflows/setup.sh
+        run: .github/scripts/setup.sh

tools/pytest_plugins/__init__.py

@@ -1 +0,0 @@
-"""Repository-local pytest plugins."""

tools/pytest_plugins/ahriman_fixtures/__init__.py

@@ -1,3 +1,22 @@
+#
+# Copyright (c) 2021-2025 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 <http://www.gnu.org/licenses/>.
+#
 import argparse
 import datetime
 import pytest
@@ -132,7 +151,7 @@ def pytest_configure() -> None:
 
 # generic fixtures
 @pytest.fixture(autouse=True)
-def register_log_context() -> None:
+def _register_log_context() -> None:
     """
     register log context variables and factory
     """
@@ -151,31 +170,6 @@ def args() -> argparse.Namespace:
                               repository=None, repository_id=None, wait_timeout=-1)
 
 
-@pytest.fixture
-def gpg(configuration: Configuration) -> GPG:
-    """
-    fixture for empty GPG
-
-    Args:
-        configuration(Configuration): configuration fixture
-
-    Returns:
-        GPG: GPG test instance
-    """
-    return GPG(configuration)
-
-
-@pytest.fixture
-def parser() -> argparse.ArgumentParser:
-    """
-    fixture for command line arguments parser
-
-    Returns:
-        argparse.ArgumentParser: command line arguments parser instance
-    """
-    return _parser()
-
-
 @pytest.fixture
 def aur_package_ahriman() -> AURPackage:
     """
@@ -324,6 +318,20 @@ def database(configuration: Configuration, mocker: MockerFixture) -> SQLite:
     return SQLite.load(configuration)
 
 
+@pytest.fixture
+def gpg(configuration: Configuration) -> GPG:
+    """
+    fixture for empty GPG
+
+    Args:
+        configuration(Configuration): configuration fixture
+
+    Returns:
+        GPG: GPG test instance
+    """
+    return GPG(configuration)
+
+
 @pytest.fixture
 def local_client(database: SQLite, configuration: Configuration) -> Client:
     """
@@ -493,6 +501,17 @@ def package_description_python2_schedule() -> PackageDescription:
     )
 
 
+@pytest.fixture
+def parser() -> argparse.ArgumentParser:
+    """
+    fixture for command line arguments parser
+
+    Returns:
+        argparse.ArgumentParser: command line arguments parser instance
+    """
+    return _parser()
+
+
 @pytest.fixture
 def remote_source() -> RemoteSource:
     """

tools/pytest_plugins/pyproject.toml

@@ -15,4 +15,4 @@ classifiers = [
 ahriman-fixtures = "ahriman_fixtures"
 
 [tool.hatch.build.targets.wheel]
-packages = ["."]
+packages = ["ahriman_fixtures"]