adding installation of deps to CircleCI builds to upgrade packages wh…

…en explicitly requested in requirements files; adding upgrading of karr lab packages to CircleCI builds
KarrLab · Aug 31, 2018 · a3134b0 · a3134b0
1 parent 49457fb
commit a3134b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,9 +11,9 @@ jobs:
       # Load packages from cache
       - restore_cache:
           keys:
-            - cache-v23-{{ .Branch }}-{{ checksum "requirements.txt" }}
-            - cache-v23-{{ .Branch }}-
-            - cache-v23-
+            - cache-v24-{{ .Branch }}-{{ checksum "requirements.txt" }}
+            - cache-v24-{{ .Branch }}-
+            - cache-v24-
 
       # Python 3 installation tasks
       - run:
@@ -22,13 +22,19 @@ jobs:
       - run:
           name: Install karr_lab_build_utils (Python 3)
           command: pip3 install -U --process-dependency-links -e .[all]
+      - run:
+          name: Install and upgrade requirements (Python 3)
+          command: |
+            set +e
+            karr_lab_build_utils3 install-requirements
+            karr_lab_build_utils3 upgrade-karr-lab-packages
       - run:
           name: Install package configuration files including credentials
           command: karr_lab_build_utils3 download-install-package-config-files
 
       # Save packages to cache
       - save_cache:
-          key: cache-v23-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: cache-v24-{{ .Branch }}-{{ checksum "requirements.txt" }}
           paths:
             - /usr/local/lib/python3.6/site-packages
 

diff --git a/karr_lab_build_utils/templates/.circleci/config.yml b/karr_lab_build_utils/templates/.circleci/config.yml
@@ -14,9 +14,9 @@ jobs:
       # Load packages from cache
       - restore_cache:
           keys:
-            - cache-v2-{{ .Branch }}-{{ checksum "requirements.txt" }}
-            - cache-v2-{{ .Branch }}-
-            - cache-v2-     
+            - cache-v1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+            - cache-v1-{{ .Branch }}-
+            - cache-v1-     
 
       # Python 3 installation tasks
       - run:
@@ -28,13 +28,19 @@ jobs:
       - run:
           name: Install package configuration files including credentials
           command: karr_lab_build_utils3 download-install-package-config-files
+      - run:
+          name: Install and upgrade requirements (Python 3)
+          command: |
+            set +e
+            karr_lab_build_utils3 install-requirements
+            karr_lab_build_utils3 upgrade-karr-lab-packages
       - run:
           name: Install package (Python 3)
           command: pip3 install -U --process-dependency-links -e .[all]
 
       # Save packages to cache
       - save_cache:
-          key: cache-v2-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: cache-v1-{{ .Branch }}-{{ checksum "requirements.txt" }}
           paths:
             - /usr/local/lib/python3.6/site-packages