Improve Python version handling and fix poetry installation

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

.github/actions/setup/action.yml

@@ -5,42 +5,48 @@ inputs:
   version:
     description: GardenLinux Python library version
     default: "0.8.9"
+  python_version:
+    description: Python version to setup
+    default: "3.13"
 
 outputs:
   version:
+    description: GardenLinux Python library version
+    value: ${{ inputs.version }}
+  python_version:
+    description: Python version to setup
+    value: ${{ inputs.python_version }}
+  package_tool:
     description: "Detected Python cache strategy."
-    value: ${{ steps.env-check.outputs.cache_type }}
+    value: ${{ steps.env-check.outputs.package_tool }}
 
 runs:
   using: composite
   steps:
-    - name: Verify requirements.txt for "actions/setup-python" with enabled "pip" cache
-      shell: bash
-      run: |
-        if [ ! -f "requirements.txt" ]; then
-            echo "gardenlinux @ git+https://github.com/gardenlinux/python-gardenlinux-lib.git@${{ inputs.version }}" | tee -a requirements.txt
-        fi
-
-    - name: Evaluate Python Environment
+    - name: Evaluate Python environment
       id: env-check
       shell: bash
       run: |
         # Determine cache type based on available lockfile
         if [ -f poetry.lock ]; then
-          echo "cache_type=poetry" >> $GITHUB_OUTPUT
+          echo "package_tool=poetry" >> $GITHUB_OUTPUT
         elif [ -f requirements.txt ]; then
-          echo "cache_type=pip" >> $GITHUB_OUTPUT
+          echo "package_tool=pip" >> $GITHUB_OUTPUT
         else
-          # no lockfile present: create empty requirements.txt and use pip caching
-          touch requirements.txt
-          echo "cache_type=pip" >> $GITHUB_OUTPUT
+          # no lockfile present: create one and use pip caching
+          echo "gardenlinux @ git+https://github.com/gardenlinux/python-gardenlinux-lib.git@${{ inputs.version }}" | tee -a requirements.txt
+          echo "package_tool=pip" >> $GITHUB_OUTPUT
         fi
 
-    - name: Set up Python 3.13
+    - name: Set up Python ${{ inputs.python_version }}
       uses: actions/setup-python@v5
       with:
-        python-version: "3.13"
-        cache: ${{ steps.env-check.outputs.cache_type }}
+        python-version: ${{ inputs.python_version }}
+        cache: ${{ steps.env-check.outputs.package_tool }}
+
+    - name: Install Poetry
+      if: steps.env-check.outputs.package_tool == 'poetry'
+      uses: snok/install-poetry@v1
 
     - name: Install GardenLinux Python library
       shell: bash

.github/workflows/pytests.yml

@@ -20,17 +20,14 @@ jobs:
       - name: Setup Gardenlinux
         uses: ./.github/actions/setup
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-
       - name: Install dependencies
         run: poetry install --with dev
 
       - name: Prepare environment
         run: make install-test
 
       - name: Run tests
-        run: | 
+        run: |
           export GLOCI_REGISTRY_TOKEN="invalid"
           make test-coverage-ci