Merge branch 'main' into 1031-support-distribution-of-xarray

helmholtz-analytics · Nov 21, 2023 · 83832bd · 83832bd
2 parents 9a6427e + 1263887
commit 83832bd
Show file tree

Hide file tree

Showing 50 changed files with 2,373 additions and 546 deletions.
diff --git a/.github/ISSUE_TEMPLATE/vulnerability.yml b/.github/ISSUE_TEMPLATE/vulnerability.yml
@@ -1,4 +1,4 @@
-name: "Vulnerability Report"
+name: "\U0001F6A8 Vulnerability Report"
 description: Report a security vulnerability in our project.
 title: "[VULNERABILITY]:  "
 labels: ["security, High Priority"]
@@ -14,50 +14,50 @@ body:
     attributes:
       label: Affected Version(s)
       description: List the affected versions of the library.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: severity
     attributes:
       label: Severity
       description: Specify the severity of the vulnerability (e.g., Low/Medium/High/Critical).
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:
       label: Description
       description: Provide a clear and concise description of the security vulnerability.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: steps-to-reproduce
     attributes:
       label: Steps to Reproduce
       description: Outline the steps to reproduce the vulnerability, including any relevant code snippets or configuration settings.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: expected-behavior
     attributes:
       label: Expected Behavior
       description: Explain what you expected to happen when following the steps above.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: actual-behavior
     attributes:
       label: Actual Behavior
       description: Describe what actually happened when you followed the steps above, highlighting the security issue.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: impact
     attributes:
       label: Impact
       description: Discuss the potential impact of this vulnerability, including any possible consequences or risks associated with its exploitation.
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: proof-of-concept
     attributes:

diff --git a/.github/workflows/bench_trigger.yml b/.github/workflows/bench_trigger.yml
@@ -28,7 +28,6 @@ jobs:
             -F "variables[PR]=${{ github.event.pull_request.number }}" \
             -F "variables[AUTHOR]=${{ github.event.pull_request.assignee.login }}" \
             https://codebase.helmholtz.cloud/api/v4/projects/7930/trigger/pipeline
-          echo sha
       - name: Trigger benchmarks (Push main)
         id: setup_push
         if: ${{ github.event_name == 'push' }}
@@ -40,9 +39,11 @@ jobs:
             -F "ref=main" \
             -F "variables[SHA]=$GITHUB_SHA" \
             -F "variables[SHORT_SHA]=${SHORT_SHA}" \
+            -F "variables[BRANCH]=main" \
             -F "variables[AUTHOR]=${{ github.event.head_commit.committer.username }}" \
             https://codebase.helmholtz.cloud/api/v4/projects/7930/trigger/pipeline
       - name: Create status
+        if: ${{ steps.setup_pr.outcome == 'success' || steps.setup_push.outcome == 'success'}}
         run: |
           curl -L -X POST \
             -H "Accept: application/vnd.github+json" \

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,17 +5,17 @@ on:
             heat_version:
                 description: 'Heat version'
                 required: true
-                default: '1.2.2'
+                default: 'latest'
                 type: string
             pytorch_img:
                 description: 'Base PyTorch Img'
                 required: true
-                default: '23.03-py3'
+                default: '23.05-py3'
                 type: string
             name:
                 description: 'Output Image name'
                 required: true
-                default: 'heat:1.2.2_torch1.13_cu12.1'
+                default: 'heat:1.3.0_torch2.0.0_cu12.1'
                 type: string
 jobs:
     build-and-push-img:
@@ -43,7 +43,7 @@ jobs:
               name: Build
               uses: docker/build-push-action@v4
               with:
-                context: docker/
+                file: docker/Dockerfile.release
                 build-args: |
                     HEAT_VERSION=${{ inputs.heat_version }}
                     PYTORCH_IMG=${{ inputs.pytorch_img}}
@@ -59,7 +59,7 @@ jobs:
               name: Build and push
               uses: docker/build-push-action@v4
               with:
-                context: docker/
+                file: docker/Dockerfile.release
                 build-args: |
                     HEAT_VERSION=${{ inputs.heat_version }}
                     PYTORCH_IMG=${{ inputs.pytorch_img}}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,17 +2,21 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
-    -   id: flake8
--   repo: https://github.com/psf/black
-    rev: 23.9.1
+    -   id: check-toml
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.10.1
     hooks:
     -   id: black
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
 -   repo: https://github.com/pycqa/pydocstyle
     rev: 6.3.0  # pick a git hash / tag to point to
     hooks: