Merge branch 'main' into medcat-v2-testing

Author: mart-r

medcat-trainer/.github/workflows/ci.yml

@@ -3,10 +3,44 @@ name: ci-build
 on: [push]
 
 jobs:
-  # run tests / lint / etc. before building container image?
+  # Test and build client library
+  test-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests pytest build
+
+      - name: Install client package in development mode
+        run: |
+          cd client
+          pip install -e .
+
+      - name: Run client tests
+        run: |
+          cd client
+          python -m pytest tests/ -v
+
+      - name: Build client package
+        run: |
+          cd client
+          python -m build
 
+  # Build and test webapp container
   build-and-push:
     runs-on: ubuntu-latest
+    needs: test-client
     steps:
       - name: Checkout main
         uses: actions/checkout@v4

medcat-trainer/.github/workflows/qa.yml

@@ -5,10 +5,50 @@ on:
     branches: [ main ]
 
 jobs:
-  # run tests / lint / etc. before building container image?
+  # Test and build client library
+  test-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests pytest build
+
+      - name: Install client package in development mode
+        run: |
+          cd client
+          pip install -e .
+
+      - name: Run client tests
+        run: |
+          cd client
+          python -m pytest tests/ -v
+
+      - name: Build client package
+        run: |
+          cd client
+          python -m build
+
+      - name: Publish dev distribution to Test PyPI
+        uses: pypa/[email protected]
+        with:
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/
 
+  # Build and test webapp container
   build-and-push:
     runs-on: ubuntu-latest
+    needs: test-client
     steps:
       - name: Checkout main
         uses: actions/checkout@v4

medcat-trainer/.github/workflows/release.yml

@@ -5,10 +5,53 @@ on:
     tags: ["v*.*.*"]
 
 jobs:
-  # run tests / lint / etc. before building container image?
+  # Test, build and publish client library
+  test-and-publish-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: "main"
+
+      - name: Release Tag
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests pytest build twine
+
+      - name: Install client package in development mode
+        run: |
+          cd client
+          pip install -e .
+
+      - name: Run client tests
+        run: |
+          cd client
+          python -m pytest tests/ -v
+
+      - name: Build client package
+        run: |
+          cd client
+          python -m build
+
+      - name: Publish production distribution to PyPI
+        if: startsWith(github.ref, 'refs/tags') && ! github.event.release.prerelease
+        uses: pypa/[email protected]
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
 
+  # Build and test webapp container
   build-and-push:
     runs-on: ubuntu-latest
+    needs: test-and-publish-client
     steps:
       - name: Checkout main
         uses: actions/checkout@v4