fix

tangtianyi1998 · Apr 5, 2021 · a8d8f7f · a8d8f7f
1 parent 1f25a73
commit a8d8f7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
-            pip install -r requirements/prod.txt -r requirements/dev.txt
+            pip install --quiet -r requirements/prod.txt -r requirements/dev.txt
 
       - save_cache:
           key: cache-{{ checksum "requirements/prod.txt" }}-{{ checksum "requirements/dev.txt" }}
@@ -47,13 +47,13 @@ jobs:
           name: run linting
           when: always
           command: |
-            cd lab8; ./tasks/lint.sh
+            cd lab8 || true; PYTHONPATH=. ./tasks/lint.sh
 
       - run:
           name: run prediction tests
           when: always
           command: |
-            cd lab8; ./tasks/test.sh
+            cd lab8 || true; PYTHONPATH=. ./tasks/test.sh
 
       - store_artifacts:
           path: test-reports

diff --git a/lab8/tasks/lint.sh b/lab8/tasks/lint.sh
@@ -2,12 +2,17 @@
 set -uo pipefail
 set +e
 
-export PYTHONPATH=.:$PYTHONPATH
-
 FAILURE=false
 
 echo "safety (failure is tolerated)"
-safety check -r requirements/prod.txt -r requirements/dev.txt
+FILE=requirements/prod.txt
+if [ -f "$FILE" ]; then
+    # We're in the main repo
+    safety check -r requirements/prod.txt -r requirements/dev.txt
+else
+    # We're in the labs repo
+    safety check -r ../requirements/prod.txt -r ../requirements/dev.txt
+fi
 
 echo "pylint"
 pylint api text_recognizer training || FAILURE=true