From 05a28e46582a8895c001498d32431a8151e6c976 Mon Sep 17 00:00:00 2001
From: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date: Mon, 21 Feb 2022 17:38:13 +0100
Subject: [PATCH] =?UTF-8?q?Pull=20request=20#13:=20Sonar=20scan=20?=
 =?UTF-8?q?=F0=9F=92=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge in RR/fb-detr from sonar-scan to master

Squashed commit of the following:

commit b5ea19f16e198071db9bc6b4864d8b7789884a25
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 17:36:02 2022 +0100

    💖

commit e1554c1f874a7af0ae3e6f480ca1db05e62a3a0b
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 16:54:56 2022 +0100

    sonarscan WIP
---
 .gitignore                                         |  1 +
 .../src/main/resources/scripts/sonar-scan.sh       | 14 ++++----------
 requirements.txt                                   |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a62d96..56faae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.vscode/
 *.h5
 /venv/
 .idea/
diff --git a/bamboo-specs/src/main/resources/scripts/sonar-scan.sh b/bamboo-specs/src/main/resources/scripts/sonar-scan.sh
index 311a575..693f216 100755
--- a/bamboo-specs/src/main/resources/scripts/sonar-scan.sh
+++ b/bamboo-specs/src/main/resources/scripts/sonar-scan.sh
@@ -7,18 +7,12 @@ python3 -m venv build_venv
 source build_venv/bin/activate
 python3 -m pip install --upgrade pip
 
-echo "dev setup for unit test and coverage"
+echo "dev setup for unit test and coverage 💖"
 
+pip install -e .
+pip install -e incl/detr
 pip install -r requirements.txt
 
-
-echo "DVC pull step"
-dvc pull
-
-echo "coverage report generation"
-coverage report -m
-coverage xml
-
 SERVICE_NAME=$1
 
 echo "dependency-check:aggregate"
@@ -40,7 +34,7 @@ then
       -Dsonar.dependencyCheck.xmlReportPath=reports/dependency-check-report.xml \
       -Dsonar.dependencyCheck.htmlReportPath=reports/dependency-check-report.html \
       -Dsonar.python.coverage.reportPaths=reports/coverage.xml
-
+ 
 else
     echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
     /usr/bin/sonar-scanner/bin/sonar-scanner \
diff --git a/requirements.txt b/requirements.txt
index c4acf39..d327140 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,4 @@ dvc[ssh]
 frozendict==2.3.0
 waitress==2.0.0
 envyaml==1.10.211231
-# PyYAML==6.0
+dependency-check==0.6.*