Updated requirements

Reviewed-on: #184

.gitea/workflows/build.yaml

@@ -10,30 +10,72 @@ jobs:
     uses: ./.gitea/workflows/prepare.yaml
     secrets: inherit
 
+  api:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, application, auth, core, dependency ]
+    with:
+      working_directory: src/api
+    secrets: inherit
+
+  application:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core, dependency ]
+    with:
+      working_directory: src/application
+    secrets: inherit
+
+  auth:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core, dependency,  database ]
+    with:
+      working_directory: src/auth
+    secrets: inherit
+
+  cli:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core ]
+    with:
+      working_directory: src/cli
+    secrets: inherit
+
   core:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-core
+      working_directory: src/core
+    secrets: inherit
+
+  database:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core, dependency ]
+    with:
+      working_directory: src/database
+    secrets: inherit
+
+  dependency:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core ]
+    with:
+      working_directory: src/dependency
+    secrets: inherit
+
+  mail:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core, dependency ]
+    with:
+      working_directory: src/mail
     secrets: inherit
 
   query:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-query
+      working_directory: src/query
     secrets: inherit
 
   translation:
     uses: ./.gitea/workflows/package.yaml
-    needs: [ prepare, core ]
+    needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-translation
+      working_directory: src/translation
-    secrets: inherit
-
-  mail:
-    uses: ./.gitea/workflows/package.yaml
-    needs: [ prepare, core ]
-    with:
-      working_directory: src/cpl-mail
     secrets: inherit

.gitea/workflows/test_before_merge.yaml

@@ -35,9 +35,16 @@ jobs:
           token: ${{ secrets.CI_ACCESS_TOKEN }}
 
       - name: Setting up Python 3.12
+        shell: bash
         run: |
-          python3.12 -m pip install -r src/requirements-dev.txt
+          python3.12 -m venv venv
+          source venv/bin/activate
+          bash ./install.sh
+          bash ./install.sh -dev
+          python3.12 -m pip install pytest
 
       - name: Testing with pytest
+        shell: bash
         run: |
+          source venv/bin/activate
           python3.12 -m pytest

install.sh

@@ -1,61 +1,64 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Find and combine requirements from src/*/requirements.txt,
+# Optionaler Dev-Installationsmodus
-# filtering out lines whose *package name* starts with "cpl-".
+dev_mode=false
-# Works with pinned versions, extras, markers, editable installs, and VCS refs.
+if [[ "${1:-}" == "-dev" ]]; then
+  dev_mode=true
+fi
 
 shopt -s nullglob
 
-req_files=(src/*/requirements.txt)
+# Wähle die passende Requirements-Datei
+pattern='requirements.txt'
+msg_hint='src/*/requirements.txt'
+if $dev_mode; then
+  pattern='requirements.dev.txt'
+  msg_hint='src/*/requirements.dev.txt'
+fi
+
+req_files=(src/*/"$pattern")
 if ((${#req_files[@]} == 0)); then
-  echo "No requirements files found at src/*/requirements.txt" >&2
+  echo "Keine Requirements-Dateien gefunden unter '$msg_hint'" >&2
   exit 1
 fi
 
 tmp_combined="$(mktemp)"
 trap 'rm -f "$tmp_combined"' EXIT
 
-# Concatenate, trim comments/whitespace, filter out cpl-* packages, dedupe.
+# Kombiniere, filtere Kommentare/Whitespace, entferne cpl-*, dedupliziere.
-# We keep non-package options/flags/constraints as-is.
 awk '
   function trim(s){ sub(/^[[:space:]]+/,"",s); sub(/[[:space:]]+$/,"",s); return s }
 
   {
     line=$0
-    # drop full-line comments and strip inline comments
     if (line ~ /^[[:space:]]*#/) next
-    sub(/#[^!].*$/,"",line)  # strip trailing comment (simple heuristic)
+    sub(/#[^!].*$/,"",line)
     line=trim(line)
     if (line == "") next
 
-    # Determine the package *name* even for "-e", extras, pins, markers, or VCS "@"
     e = line
-    sub(/^-e[[:space:]]+/,"",e)           # remove editable prefix
+    sub(/^-e[[:space:]]+/,"",e)
-    # Tokenize up to the first of these separators: space, [ < > = ! ~ ; @
     token = e
-    sub(/\[.*/,"",token)                  # remove extras quickly
+    sub(/\[.*/,"",token)
     n = split(token, a, /[<>=!~;@[:space:]]/)
     name = tolower(a[1])
 
-    # If the first token (name) starts with "cpl-", skip this requirement
     if (name ~ /^cpl-/) next
-
     print line
   }
 ' "${req_files[@]}" | sort -u > "$tmp_combined"
 
 if ! [ -s "$tmp_combined" ]; then
-  echo "Nothing to install after filtering out cpl-* packages." >&2
+  echo "Nichts zu installieren nach dem Entfernen von cpl-* Paketen." >&2
   exit 0
 fi
 
-echo "Installing dependencies (excluding cpl-*) from:"
+echo "Installiere Abhängigkeiten (ohne cpl-*) aus:"
 printf '  - %s\n' "${req_files[@]}"
 echo
-echo "Final set to install:"
+echo "Finale Menge zur Installation:"
 cat "$tmp_combined"
 echo
 
-# Use python -m pip for reliability; change to python3 if needed.
 python -m pip install -r "$tmp_combined"

src/cli/pyproject.toml

@@ -26,6 +26,9 @@ Homepage = "https://www.sh-edraft.de"
 where = ["."]
 include = ["cpl*"]
 
+[tool.setuptools.package-data]
+"cpl.cli" = [".cpl/**/*"]
+
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
 optional-dependencies.dev = { file = ["requirements.dev.txt"] }

src/core/requirements.txt

@@ -4,3 +4,4 @@ tabulate==0.9.0
 termcolor==3.1.0
 pynput==1.8.1
 croniter==6.0.0
+cryptography==46.0.2