Merge branch 'master' of https://github.com/KarrLab/intro_to_wc_modeling

KarrLab · Jan 4, 2018 · 08bb175 · 08bb175
2 parents 3b94778 + 67dda35
commit 08bb175
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /root/project
     docker:
-      - image: karrlab/build:0.0.16
+      - image: karrlab/build:0.0.18
     steps:
       - checkout
 
@@ -15,13 +15,9 @@ jobs:
 
       - run: pip2 install -U --process-dependency-links git+https://github.com/KarrLab/pkg_utils.git#egg=pkg_utils
       - run: pip2 install -U --process-dependency-links git+https://github.com/KarrLab/karr_lab_build_utils.git#egg=karr_lab_build_utils
-      - run: karr_lab_build_utils2 install-requirements
-      - run: pip2 install -U --process-dependency-links -e .[all]
 
       - run: pip3 install -U --process-dependency-links git+https://github.com/KarrLab/pkg_utils.git#egg=pkg_utils
       - run: pip3 install -U --process-dependency-links git+https://github.com/KarrLab/karr_lab_build_utils.git#egg=karr_lab_build_utils
-      - run: karr_lab_build_utils3 install-requirements
-      - run: pip3 install -U --process-dependency-links -e .[all]
 
       - save_cache:
           key: cache-v8-{{ .Branch }}-{{ checksum "requirements.txt" }}
@@ -32,16 +28,26 @@ jobs:
       - run: |
           set +e
 
-          karr_lab_build_utils2 run-tests --with-xunit --with-coverage
-          RESULT_PY2=$?
+          pip2 install -U --process-dependency-links -e .[all] \
+          && karr_lab_build_utils2 upgrade-requirements \
+          && karr_lab_build_utils2 run-tests --with-xunit --with-coverage
+          RESULT_TESTS_PY2=$?
 
-          karr_lab_build_utils3 run-tests --with-xunit --with-coverage
-          RESULT_PY3=$?
+          pip3 install -U --process-dependency-links -e .[all] \
+          && karr_lab_build_utils3 upgrade-requirements \
+          && karr_lab_build_utils3 run-tests --with-xunit --with-coverage
+          RESULT_TESTS_PY3=$?
 
-          karr_lab_build_utils3 do-post-test-tasks
+          # Post-test tasks
+          if [[ $RESULT_TESTS_PY2 -eq 0 && $RESULT_TESTS_PY3 -eq 0 ]]; then
+            RESULT_TESTS=0
+          else
+            RESULT_TESTS=1
+          fi
+          karr_lab_build_utils3 do-post-test-tasks $RESULT_TESTS
           RESULT_POST_TASKS=$?
 
-          if [[ $RESULT_PY2 -eq 0 && $RESULT_PY3 -eq 0 && $RESULT_POST_TASKS -eq 0 ]]; then
+          if [[ $RESULT_TESTS -eq 0 && $RESULT_POST_TASKS -eq 0 ]]; then
             exit 0
           else
             exit 1