Updated ci

.gitea/workflows/build.yaml

@@ -0,0 +1,34 @@
+name: Build on push
+run-name: Build on push
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  prepare:
+    uses: ./.gitea/workflows/prepare.yaml
+    with:
+      working_directory: src/cpl_core
+    secrets: inherit
+
+  core:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    with:
+      working_directory: src/cpl_core
+    secrets: inherit
+
+  query:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    with:
+      working_directory: src/cpl_query
+    secrets: inherit
+
+  translation:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    with:
+      working_directory: src/cpl_translation
+    secrets: inherit

.gitea/workflows/build_dev.yaml

@@ -10,20 +10,26 @@ jobs:
     uses: ./.gitea/workflows/prepare.yaml
     with:
       version_suffix: 'dev'
+      working_directory: src/cpl_core
     secrets: inherit
 
   core:
     needs: prepare
     uses: ./.gitea/workflows/package.yaml
-    defaults:
+    with:
-      run:
+      working_directory: src/cpl_core
-        working-directory: src/cpl_core
     secrets: inherit
 
   query:
     needs: prepare
     uses: ./.gitea/workflows/package.yaml
-    defaults:
+    with:
-      run:
+      working_directory: src/cpl_query
-        working-directory: src/cpl_query
+    secrets: inherit
+
+  translation:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    with:
+      working_directory: src/cpl_translation
     secrets: inherit

.gitea/workflows/package.yaml

@@ -8,11 +8,17 @@ on:
         description: 'Suffix for version (z.B. "dev", "alpha", "beta")'
         required: false
         type: string
+      working_directory:
+        required: true
+        type: string
 
 jobs:
   build:
     runs-on: [ runner ]
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    defaults:
+      run:
+        working-directory: ${{ inputs.working_directory }}
 
     steps:
       - name: Clone Repository
@@ -27,12 +33,9 @@ jobs:
 
       - name: Set version
         run: |
-          VERSION_SUFFIX="${{ inputs.version_suffix }}"
+          sed -i -E "s/^version = \".*\"/version = \"$(cat /workspace/sh-edraft.de/cpl/version.txt)\"/" pyproject.toml
-          if [ -n "$VERSION_SUFFIX" ]; then
+          echo "Set version to $(cat /workspace/sh-edraft.de/cpl/version.txt)"
-            sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)-$VERSION_SUFFIX\"/" pyproject.toml
+          cat pyproject.toml
-          else
-            sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)\"/" pyproject.toml
-          fi
 
       - name: Install Dependencies
         run: |
@@ -40,7 +43,7 @@ jobs:
 
       - name: Build Package
         run: |
-          python -m build --sdist --wheel --outdir dist
+          python -m build --outdir dist
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1

.gitea/workflows/prepare.yaml

@@ -3,11 +3,22 @@ run-name: Prepare Build Version
 
 on:
   workflow_call:
+    inputs:
+      version_suffix:
+        description: 'Suffix for version (z.B. "dev", "alpha", "beta")'
+        required: false
+        type: string
+      working_directory:
+        required: true
+        type: string
 
 jobs:
   prepare:
     runs-on: [ runner ]
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    defaults:
+      run:
+        working-directory: ${{ inputs.working_directory }}
     steps:
       - name: Clone Repository
         uses: https://github.com/actions/checkout@v3
@@ -21,7 +32,16 @@ jobs:
           DATE=$(date +'%Y.%m.%d')
           TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
           BUILD_NUMBER=$(($TAG_COUNT + 1))
-          BUILD_VERSION="${DATE}.${BUILD_NUMBER}.dev1"
+          
+          VERSION_SUFFIX=${{ inputs.version_suffix }}
+          if [ -n "$VERSION_SUFFIX" ] && [ "$VERSION_SUFFIX" = "dev" ]; then
+            BUILD_VERSION="${DATE}.dev${BUILD_NUMBER}"
+          elif [ -n "$VERSION_SUFFIX" ]; then
+            BUILD_VERSION="${DATE}.${BUILD_NUMBER}${VERSION_SUFFIX}"
+          else
+            BUILD_VERSION="${DATE}.${BUILD_NUMBER}"
+          fi
+          
           echo "$BUILD_VERSION" > version.txt
           echo "VERSION $BUILD_VERSION"
 
@@ -37,4 +57,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: version
-          path: version.txt
+          path: ${{ inputs.working_directory }}/version.txt

src/cpl_query/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "cpl-query"
 version = "2024.7.0"
 description = "CPL query"
-readme = { text = "CPL query package" }
+readme ="CPL query package"
 requires-python = ">=3.12"
 license = { text = "MIT" }
 authors = [

src/cpl_query/requirements.dev.txt

@@ -0,0 +1 @@
+black==25.1.0

src/cpl_translation/pyproject.toml

@@ -0,0 +1,38 @@
+[build-system]
+requires = ["setuptools>=70.1.0", "wheel>=0.43.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "cpl-translation"
+version = "2024.7.0"
+description = "CPL translation"
+readme = "CPL translation package"
+requires-python = ">=3.12"
+license = { text = "MIT" }
+authors = [
+    { name = "Sven Heidemann", email = "sven.heidemann@sh-edraft.de" }
+]
+keywords = ["cpl", "translation", "backend", "shared", "library"]
+
+dynamic = ["dependencies", "optional-dependencies"]
+
+[project.urls]
+Homepage = "https://www.sh-edraft.de"
+
+[tool.setuptools]
+package-dir = { "" = "." }
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["cpl_translation*"]
+exclude = [
+    "__pycache__",
+    "logs",
+    "tests",
+]
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.txt"] }
+optional-dependencies.dev = { file = ["requirements.dev.txt"] }
+

src/cpl_translation/requirements.dev.txt

@@ -0,0 +1 @@
+black==25.1.0

src/cpl_translation/requirements.txt

@@ -0,0 +1,2 @@
+--extra-index-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi/simple/
+cpl-core