Merge branch 'main' into documentation

alan-turing-institute · Aug 3, 2023 · 2a72482 · 2a72482
2 parents ebdcd5c + 6988692
commit 2a72482
Show file tree

Hide file tree

Showing 73 changed files with 28,252 additions and 23,348 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -0,0 +1,119 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "commitType": "docs",
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "nbarlowATI",
+      "name": "nbarlowATI",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33832774?v=4",
+      "profile": "https://github.com/nbarlowATI",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "design",
+        "example",
+        "ideas",
+        "test"
+      ]
+    },
+    {
+      "login": "mhauru",
+      "name": "Markus Hauru",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5229876?v=4",
+      "profile": "http://mhauru.org",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "design",
+        "example",
+        "ideas",
+        "test"
+      ]
+    },
+    {
+      "login": "AoifeHughes",
+      "name": "Aoife Hughes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10923695?v=4",
+      "profile": "https://github.com/AoifeHughes",
+      "contributions": [
+        "bug",
+        "code",
+        "ideas",
+        "test"
+      ]
+    },
+    {
+      "login": "entopia",
+      "name": "Flora",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4749503?v=4",
+      "profile": "https://www.turing.ac.uk/people/researchers/flora-roumpani",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "design",
+        "example",
+        "ideas"
+      ]
+    },
+    {
+      "login": "chrisdburr",
+      "name": "Christopher Burr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63010234?v=4",
+      "profile": "https://github.com/chrisdburr",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "design",
+        "example",
+        "ideas",
+        "test",
+        "review"
+        "talk",
+        "userTesting",
+        "research",
+        "promotion",
+        "projectManagement"
+      ]
+    },
+    {
+      "login": "cassgvp",
+      "name": "Cassandra Gould van Praag",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43407869?v=4",
+      "profile": "https://www.turing.ac.uk/research/harnessing-power-digital-twins/turing-research-and-innovation-cluster-digital-twins",
+      "contributions": [
+        "ideas",
+        "review",
+        "projectManagement",
+        "question",
+        "design"
+      ]
+    }
+      "login": "kallewesterling",
+      "name": "Kalle Westerling",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7298727?v=4",
+      "profile": "http://www.westerling.nu",
+      "contributions": [
+        "ideas",
+        "review",
+        "projectManagement",
+        "question",
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "skipCi": true,
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "projectName": "AssurancePlatform",
+  "projectOwner": "alan-turing-institute"
+}
diff --git a/.github/workflows/backend-docker.yaml b/.github/workflows/backend-docker.yaml
@@ -1,9 +1,15 @@
 name: backend-docker
 
 on:
-  push:
-    branches: [main, dev]
   workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+  release:
+    types:
+      - published
 
 jobs:
   build:
@@ -15,13 +21,13 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - uses: actions/checkout@v3
-      - name: 'Build main'
+      - name: "Build main"
         if: ${{ github.ref == 'refs/heads/main' }}
         working-directory: eap_backend
         run: |
           docker build -t turingassuranceplatform/eap_backend:main -f Dockerfile .
           docker push turingassuranceplatform/eap_backend:main
-      - name: 'Build dev'
+      - name: "Build dev"
         if: ${{ github.ref == 'refs/heads/dev' }}
         working-directory: eap_backend
         run: |

diff --git a/.github/workflows/backend-style.yaml b/.github/workflows/backend-style.yaml
diff --git a/.github/workflows/backend-tests.yaml b/.github/workflows/backend-tests.yaml
@@ -1,5 +1,14 @@
 name: backend-tests
-on: [push, pull_request, workflow_dispatch]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+  release:
+    types:
+      - published
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,12 +1,35 @@
 name: ci
 on:
+  workflow_dispatch:
+  pull_request:
   push:
     branches:
-      - master
       - main
+      - develop
+  release:
+    types:
+      - published
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 permissions:
   contents: write
 jobs:
+  pre-commit:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - uses: pre-commit/action@v3.0.0
+        with:
+          extra_args: --hook-stage manual --all-files
+
   deploy:
     runs-on: ubuntu-latest
     if: github.event.repository.fork == false
@@ -22,11 +45,13 @@ jobs:
           path: .cache
           restore-keys: |
             mkdocs-material-
-      - run: pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
+      - run:
+          pip install
+          git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
       - name: Build and Deploy
         working-directory: ./site
         run: |
           mkdocs build
           mkdocs gh-deploy --force
 env:
-  GH_TOKEN: ${{ secrets.GH_TOKEN }} 
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/frontend-docker.yaml b/.github/workflows/frontend-docker.yaml
@@ -15,13 +15,13 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - uses: actions/checkout@v3
-      - name: 'Build main'
+      - name: "Build main"
         if: ${{ github.ref == 'refs/heads/main' }}
         working-directory: frontend
         run: |
           docker build -t turingassuranceplatform/eap_frontend:main -f Dockerfile .
           docker push turingassuranceplatform/eap_frontend:main
-      - name: 'Build dev'
+      - name: "Build dev"
         if: ${{ github.ref == 'refs/heads/dev' }}
         working-directory: frontend
         run: |

diff --git a/.github/workflows/frontend-style.yaml b/.github/workflows/frontend-style.yaml
diff --git a/.github/workflows/frontend-tests.yaml b/.github/workflows/frontend-tests.yaml
@@ -1,5 +1,14 @@
 name: frontend-tests
-on: [push, pull_request, workflow_dispatch]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+  release:
+    types:
+      - published
 defaults:
   run:
     working-directory: ./frontend

diff --git a/.gitignore b/.gitignore
@@ -135,4 +135,4 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-.DS_Store
+.DS_Store
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,19 +1,58 @@
+ci:
+  autoupdate_commit_msg: "chore: update pre-commit hooks"
+  autofix_commit_msg: "style: pre-commit fixes"
+
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
-  hooks:
-  - id: check-yaml
-  - id: end-of-file-fixer
-  - id: trailing-whitespace
-- repo: https://github.com/psf/black
-  rev: 22.3.0
-  hooks:
-  - id: black
-    language: python
-    files: ^eap_backend/
-- repo: https://github.com/pre-commit/mirrors-prettier
-  rev: v2.6.0
-  hooks:
-  - id: prettier
-    files: ^frontend/src/
-    args: [--write]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.0.280"
+    hooks:
+      - id: ruff
+        args: ["--fix", "--show-fixes"]
+
+  - repo: https://github.com/psf/black
+    rev: "23.7.0"
+    hooks:
+      - id: black
+        language: python
+        files: ^eap_backend/
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: "v4.4.0"
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-symlinks
+      # - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      #- id: name-tests-test
+      #  args: ["--pytest-test-first"]
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: "v1.10.0"
+    hooks:
+      - id: rst-backticks
+      - id: rst-directive-colons
+      - id: rst-inline-touching-normal
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v3.0.0"
+    hooks:
+      - id: prettier
+        types_or: [yaml, markdown, html, css, scss, javascript, json]
+        args: [--prose-wrap=always]
+
+  - repo: https://github.com/asottile/blacken-docs
+    rev: "1.15.0"
+    hooks:
+      - id: blacken-docs
+        additional_dependencies: [black==23.3.0]
+
+  # - repo: https://github.com/shellcheck-py/shellcheck-py
+  #   rev: "v0.9.0.2"
+  #   hooks:
+  #     - id: shellcheck