Simplify version management and update for next release

.github/workflows/backend-check.yaml

@@ -73,13 +73,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - uses: Gr1N/setup-poetry@v9
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          cd backend
+          poetry install
       - name: Run functional tests in pod
         run: |
           cd backend

.github/workflows/build-push.yaml

@@ -16,7 +16,12 @@ jobs:
         fetch-depth: 10
     - uses: actions/setup-python@v4
       with:
-        python-version: "3.11"
+        python-version: "3.9"
+    - uses: Gr1N/setup-poetry@v9
+    - name: Install dependencies
+      run: |
+        cd backend
+        poetry install
 
     - name: Build Frontend Image
       id: build-front
@@ -39,7 +44,9 @@ jobs:
         password: ${{ secrets.QUAY_TOKEN }}
 
     - name: Generate version file
-      run: ./backend/scripts/version.py
+      run: |
+        cd backend
+        poetry run scripts/version.py
 
     - name: Build Backend Image
       id: build-back

.github/workflows/frontend-check.yaml

@@ -21,8 +21,15 @@ jobs:
       run:
         working-directory: ./frontend
     steps:
-      - name: checkout project
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - uses: Gr1N/setup-poetry@v9
+      - name: Install dependencies
+        run: |
+          cd ../backend
+          poetry install
       - name: build tests image
         run: podman build -t cypress -f e2e_frontend.containerfile .
       - name: Make e2e script executable
@@ -35,4 +42,3 @@ jobs:
         with:
           name: cypress-coverage-report
           path: frontend/coverage
-

.github/workflows/poetry-check.yaml

@@ -11,7 +11,7 @@ jobs:
         - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
-            python-version: "3.11"
+            python-version: "3.9"
         - uses: Gr1N/setup-poetry@v9
         - name: verify poetry instalation
           run: poetry --version

.github/workflows/release-build-push.yaml

@@ -17,7 +17,12 @@ jobs:
         fetch-depth: 10
     - uses: actions/setup-python@v4
       with:
-        python-version: "3.11"
+        python-version: "3.9"
+    - uses: Gr1N/setup-poetry@v9
+    - name: Install dependencies
+      run: |
+        cd backend
+        poetry install
 
     - name: Build Frontend Image
       id: build-front
@@ -40,7 +45,9 @@ jobs:
         password: ${{ secrets.QUAY_TOKEN }}
 
     - name: Generate version file
-      run: ./backend/scripts/version.py
+      run: |
+        cd backend
+        poetry run scripts/version.py
 
     - name: Build Backend Image
       id: build-back

backend/pyproject.toml

@@ -2,8 +2,8 @@
 name = "openshift_perfscale_api"
 requires-python = ">=3.9,<3.10"
 dynamic = ["dependencies"]
-version = "0.1.1"
-description = "Python transformer of OpenShift performance and scale test results"
+version = "0.2.2"
+description = "Aggregator for Performance & Scale CPT data"
 authors = [{name = "mleader", email = "mleader@redhat.com"}]
 
 [tool.poetry]
@@ -35,6 +35,7 @@ trio = "^0.28.0"
 uvicorn = "^0.34.0"
 uvloop = "^0.21.0"
 vyper-config = "1.0.0"
+tomlkit = "^0.13.3"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"

backend/scripts/version.py

@@ -12,6 +12,8 @@
 import sys
 from typing import Optional
 
+import tomlkit
+
 
 def do(cmd: list[str]) -> list[str]:
     result = subprocess.run(cmd, text=True, capture_output=True)
@@ -32,7 +34,9 @@ def getone(cmd: list[str], if_none: Optional[str] = None) -> str:
 def main():
     top = Path(getone(["git", "rev-parse", "--show-toplevel"]))
     backend = top / "backend"
-    version = (backend / "VERSION").read_text().strip()
+    with (backend / "pyproject.toml").open() as tml:
+        config = tomlkit.load(tml)
+    version = config["project"]["version"]
     sha = getone(["git", "rev-parse", "--short", "HEAD"])
     branch = getone(["git", "branch", "--show-current"], if_none="CI")
     display = f"v{version}-{sha}"
@@ -53,8 +57,4 @@ def main():
 
 
 if __name__ == "__main__":
-    try:
-        sys.exit(main())
-    except Exception as exc:
-        print(f"Failed with {str(exc)!r}", file=sys.stderr)
-        sys.exit(1)
+    sys.exit(main())

testing/pod_setup.sh

@@ -62,7 +62,7 @@ echo "Creating pod ${POD_NAME}"
 podman pod create --name=${POD_NAME} ${PUBLISH}
 
 echo "Creating version"
-${BACKEND}/scripts/version.py
+( cd ${BACKEND}; poetry run scripts/version.py )
 podman build -f backend.containerfile --tag backend "${BACKEND}"
 podman build -f frontend.containerfile --tag frontend "${FRONTEND}"
 podman build -f ${TESTING}/functional.containerfile --tag functional "${BRANCH}"