Only run pytest in the Container, run ruff separately

Pulling devel dependencies like ruff (and eventually pyright)
into the prod container isn't the best setup - instead make
test.sh able to run only some tests and:

 * Run the full tools/test.sh in a separate "Run Tests" CI action
 * Only run ./tools/test.sh --pytest when building the Container

Author: owtaylor

.github/workflows/build-container.yml

@@ -0,0 +1,50 @@
+name: Run Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  run-tests-in-container:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Build container image with podman
+        run: |
+          podman build \
+              -f Containerfile \
+              -t flatpak-indexer:latest \
+              --build-arg=FLATPAK_INDEXER_UPDATE_TEST_DATA=1 \
+              .
+
+  source-code-checks:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install python3.12-dev gcc libkrb5-dev
+          pip install uv
+          uv sync
+
+      - name: Check source code
+        run: |
+            uv run tools/test.sh --ruff-format --ruff-check

.github/workflows/run-tests.yml

@@ -37,7 +37,7 @@ COPY --from=tar-diff-builder /opt/app-root/bin/tar-diff /opt/app-root/bin/
 COPY --from=builder /opt/app-root /opt/app-root
 
 # Run tests
-RUN $APP_ROOT/src/tools/test.sh
+RUN $APP_ROOT/src/tools/test.sh --pytest
 
 # Set the default command for the resulting image
 CMD /usr/libexec/s2i/run

Containerfile

@@ -19,7 +19,7 @@ dependencies = [
     "requests",
     "PyYAML",
     "version_utils>=0.3.2",
-    # Dev requirements - listed in main dependencies to make the image
+    # Test requirements - listed in main dependencies to make the image
     # self-contained for testing.
     # 2.22.0 contains an accidental incompatibility with python < 3.11,
     # fixed in git.
@@ -29,25 +29,16 @@ dependencies = [
     "pytest",
     "pytest-cov",
     "pytest-socket",
-    "ruff",
     "responses",
     "www-authenticate",
 ]
 
 [project.scripts]
 flatpak-indexer = "flatpak_indexer.cli:cli"
 
-[project.optional-dependencies]
-# Alternative: install only dev dependencies separately
+[dependency-groups]
 dev = [
-    "fakeredis!=2.22.0",
-    "graphql-core",
-    "iso8601",
-    "pytest",
-    "pytest-cov",
-    "pytest-socket",
-    "responses",
-    "www-authenticate",
+    "ruff",
 ]
 
 [tool.setuptools.packages.find]

pyproject.toml

@@ -1,25 +1,58 @@
 #!/bin/bash
 
-set +e -x
-
 # These are set to build-time specific location when building the Red Hat-internal
 # image; unset them to avoid breaking things at runtime.
 unset REQUESTS_CA_BUNDLE
 unset GIT_SSL_CAINFO
 
-pytest --cov-fail-under=100 "$@"
+modules=()
+pytest_args=()
+all=true
+failed=""
+
+for arg in "$@" ; do
+    case $arg in
+        --pytest|--ruff-check|--ruff-format|--pyright)
+            modules+=("${arg#--}")
+            all=false
+            ;;
+        *)
+            modules+=(pytest)
+            pytest_args+=("$arg")
+            all=false
+            ;;
+    esac
+done
+
+if $all ; then
+    modules=(pytest pyright ruff-check ruff-format)
+fi
 
-[ $? == 0 ] || failed="$failed pytest"
-ruff format --check flatpak_indexer tests tools
-[ $? == 0 ] || failed="$failed ruff-format"
-ruff check flatpak_indexer tests tools
-[ $? == 0 ] || failed="$failed ruff-check"
+if [[ "${#pytest_args[@]}" = 0 ]] ; then
+    pytest_args=(--cov-fail-under=100)
+fi
+
+run() {
+    module=$1
+    shift
+    if [[ " ${modules[*]} " =~ " $module " ]] ; then
+        if [[ -t 1 ]] ; then
+            echo -e "\e[33m\e[1mRUNNING\e[0m: $*"
+        else
+            echo "RUNNING: $*"
+        fi
+        "$@"
+        [[ $? -eq 0 ]] || failed="$failed $module"
+    fi
+}
 
-set -e +x
+run pytest pytest "${pytest_args[@]}"
+run ruff-format ruff format --check flatpak_indexer tests tools
+run ruff-check ruff check flatpak_indexer tests tools
 
-if [ "$failed" != "" ] ; then
+if [[ "$failed" != "" ]] ; then
     if [[ -t 1 ]] ; then
-        echo -e "\e[31m\e[1mFAILED:\e[0m$failed"
+        echo -e "\e[31m\e[1mFAILED\e[0m:$failed"
     else
         echo -e "FAILED:$failed"
     fi