PR-493 - merge

.github/workflows/basic-tests.yml

@@ -1,6 +1,6 @@
-name: 'Basic (Unit) Tests'
+# Install python and node. Run lint and unit tests.
 
-# **What it does**: Setups up python dependencies and runs tests.
+name: 'Basic (Unit) Tests'
 # **Why we have it**: Automatically run tests to ensure code doesn't introduce regressions.
 # **Who does it impact**: Python small-scale "unit" tests.
 
@@ -22,13 +22,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
+      - name: Install Poetry
+        run: |
+          python -m pip install poetry==1.4.1
 
       - name: Install Python3
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9.x'
-          cache: 'pip'
-          cache-dependency-path: requirements.txt
+          python-version: '3.10.x'
+          cache: 'poetry'
+
+      - name: Install dependencies and cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pypoetry
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Install dependencies
+        run: make install-python
 
       - uses: actions/setup-node@v3
         with:
@@ -37,7 +49,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          make install-python
           npm ci
 
       - name: Lint
@@ -56,20 +67,30 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install Poetry
+        run: |
+          python -m pip install poetry==1.4.1
+
       - name: Install Python3
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9.x'
-          cache: 'pip'
+          python-version: '3.10.x'
+          cache: 'poetry'
+
+      - name: Install dependencies and cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pypoetry
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
 
       - name: Install dependencies
-        run: python3 -m pip install -r requirements.txt
+        run: make install-python
 
       - name: Run Tests
         run: make coverage
 
       - name: Check coverage
-        run: coverage report --fail-under=80
+        run: make coverage-report
 
   run-js-tests:
     runs-on: ubuntu-22.04

.github/workflows/external-pr-open.yml

@@ -1,7 +1,6 @@
 # Ambuda workflow to build and publish docker image
 
-name: Build and test incoming
-
+name: Basic image build and test
 env:
   AMBUDA_VERSION: v0.1
   AMBUDA_HOST_IP: 127.0.0.1
@@ -19,7 +18,6 @@ jobs:
   build_and_test:
     name: Build external pr image
     runs-on: ubuntu-22.04
-    environment: staging
     permissions:
       packages: write
       contents: read
@@ -38,7 +36,7 @@ jobs:
 
       - name: Build and Test docker image
         id: build-to-test
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: .
           file: build/containers/Dockerfile.final

.github/workflows/rel-pr-create.yml

@@ -1,14 +1,13 @@
-# Ambuda workflow to build and publish docker image
-
-name: Create Release PR on seeing new code 
+# Check for changes in "main". Push changes to "releases".
 
+name: Push changes from main to releases
 env:
   GH_TOKEN: ${{ github.token }}
 
   # head/branch where current changes reside befor merge
-  PR_SOURCE_BRANCH: development
+  PR_SOURCE_BRANCH: main
   # base - branch intended to change once the proposed changes are meged.
-  PR_TARGET_BRANCH: releases
+  PR_TARGET_BRANCH: release
 
 on:
   workflow_dispatch:
@@ -28,16 +27,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ env.PR_TARGET_BRANCH }}  
-      - name: Find the recent PR merge on development
+      - name: Find the recent PR merge on ${{ env.PR_SOURCE_BRANCH }}
         id: find_pr
         run: |
-          LAST_RUNTIME=$(date +'%Y-%m-%dT%H:%M:%S' --date '-30000 min')
+          LAST_RUNTIME=$(date +'%Y-%m-%dT%H:%M:%S' --date '-1800 min')
           gh repo set-default ambuda-org/ambuda
           echo "PR_NUMBER=$(gh pr list --state merged --base ${{ env.PR_SOURCE_BRANCH }} --search "merged:>$LAST_RUNTIME" -L 1 --json number| jq '.[].number')" >> $GITHUB_OUTPUT
 
   create_pr:
     runs-on: ubuntu-22.04
-    name: Create PR on releases branch
+    name: Create PR on release branch
     environment: staging
     permissions:
       packages: write
@@ -61,4 +60,4 @@ jobs:
           base: ${{ env.PR_TARGET_BRANCH }}  
           branch: ${{ env.PR_TARGET_BRANCH }}-${{ env.PR_NUMBER }}
           title: PR-${{ env.PR_NUMBER }} - merge
-          body:  development/PR-${{ env.PR_NUMBER }} merge is open
+          body:  ${{ env.PR_SOURCE_BRANCH }}/PR-${{ env.PR_NUMBER }} merge is open

.github/workflows/rel-pr-merged.yml

@@ -1,7 +1,6 @@
-# Ambuda workflow to build and publish docker image
-
-name: Teardown staging
+# Cleanup staging. Usually occurs after a pr is merged or closed.
 
+name: Teardown staging deployment
 env:
   AMBUDA_VERSION: v0.1
 
@@ -13,7 +12,7 @@ on:
   #     - 'v*'
   pull_request:
     branches:
-      - 'releases'
+      - 'release'
     types:
       - closed
 

.github/workflows/rel-pr-open.yml

@@ -1,17 +1,17 @@
-# Ambuda workflow to build and publish docker image
-
-name: Build publish and staging
+# Build release image. Push image to ghcr.io. Deploy on staging environment.
 
+name: Release image build & publish
 env:
   AMBUDA_VERSION: v0.1
   AMBUDA_HOST_IP: 127.0.0.1
   AMBUDA_HOST_PORT: 5090
   REGISTRY: ghcr.io
 
 on:
+  workflow_dispatch:
   pull_request:
     branches:
-      - 'releases'
+      - 'release'
     types: [opened, reopened, synchronize]
 
 jobs:
@@ -60,7 +60,7 @@ jobs:
 
       - name: Build and push Docker images
         id: publish
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: .
           file: build/containers/Dockerfile.final

.gitignore

@@ -1,6 +1,8 @@
 # Large data files, including texts, parse data, and (in local dev)
 # image uploads.
 data/
+deploy/data_database
+deploy/data_files
 
 # Autogenerated files (compiled CSS, testing, documentation, ...)
 .coverage