Merge branch 'pip/grafana-email/dependencies' into 'master'

Pip/grafana email/dependencies See merge request ix.ai/grafana-email!13
ix-ai · Feb 27, 2021 · 97502cf · 97502cf
2 parents 3c28ab9 + 2829b89
commit 97502cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+---
 variables:
   DOCKERHUB_REPO_NAME: grafana-email
   ENABLE_ARM64: 'true'
@@ -8,3 +9,8 @@ variables:
 include:
   - project: 'ix.ai/ci-templates'
     file: '/python-project.yml'
+  - template: Security/SAST.gitlab-ci.yml
+  - template: Dependency-Scanning.gitlab-ci.yml
+
+sast:
+  stage: test
diff --git a/grafana-email/grafana-email.py b/grafana-email/grafana-email.py
@@ -12,7 +12,7 @@
 import requests
 from PIL import Image
 import pygelf
-import constants
+from . import constants
 
 
 LOG = logging.getLogger(__name__)

diff --git a/grafana-email/requirements.txt b/grafana-email/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.25.0
-pygelf==0.3.6
+requests==2.25.1
+pygelf==0.4.0
 pillow>=6.2.1