Merge branch 'release/2.6.12'

azavea · Jan 28, 2019 · b8ef54a · b8ef54a
2 parents 3f3c417 + 3c20ed3
commit b8ef54a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml
@@ -15,17 +15,16 @@ root_media_dir: "/media/cac"
 cac_python_dependencies:
     - { name: 'base58', version: '1.0.2' }
     - { name: 'boto', version: '2.49.0' }
-    - { name: 'django', version: '1.11.16' }
+    - { name: 'django', version: '1.11.18' }
     - { name: 'django-ckeditor', version: '5.6.1' }
     - { name: 'django-image-cropping', version: '1.2.0' }
     - { name: 'django-extensions', version: '1.9.9' }
     - { name: 'django-storages', version: '1.7.1' }
     - { name: 'easy-thumbnails', version: '2.5.0' }
     - { name: 'gunicorn', version: '19.9.0' }
-    - { name: 'Pillow', version: '5.3.0' }
-    - { name: 'psycopg2-binary', version: '2.7.5' }
-    - { name: 'pytz', version: '2018.7' }
-    - { name: 'pyyaml', version: '3.13' }
+    - { name: 'Pillow', version: '5.4.1' }
+    - { name: 'psycopg2-binary', version: '2.7.7' }
+    - { name: 'pytz', version: '2018.9' }
     - { name: 'troposphere', version: '1.8.1' }
     - { name: 'majorkirby', version: '0.2.1' }
     # Note: django-wpadmin is installed manually to work around the fact that ansible-pip

diff --git a/deployment/packer/cac.json b/deployment/packer/cac.json
@@ -79,8 +79,8 @@
         "mkdir -p {{user `intermediate_directory`}}",
         "sudo apt-get -y install build-essential python-dev python-pip git",
         "sudo pip install --upgrade pip",
-        "sudo pip install paramiko==1.16.0",
-        "sudo pip install ansible==2.4.2.0"
+        "sudo pip install paramiko==2.4.2",
+        "sudo pip install ansible==2.7.6"
       ]
     },
     {

diff --git a/python/cac_tripplanner/templates/service-worker.js b/python/cac_tripplanner/templates/service-worker.js
@@ -1,7 +1,7 @@
 // Service Worker to support functioning as a PWA
 // https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers
 
-var CACHE_NAME = 'cac_tripplanner_v18';
+var CACHE_NAME = 'cac_tripplanner_v19';
 
 var cacheFiles = {{ cache_files | safe }};