From 01da388454b4770234f002ded3166104aede553e Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 25 Jan 2019 14:48:14 -0500 Subject: [PATCH 1/4] Bump serviceworker version --- python/cac_tripplanner/templates/service-worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cac_tripplanner/templates/service-worker.js b/python/cac_tripplanner/templates/service-worker.js index e868f9655..6b6be9d46 100644 --- 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 }}; From b58a3abb0e442bba06f2bf89cc25556e3c4ded66 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 25 Jan 2019 15:53:37 -0500 Subject: [PATCH 2/4] Update pip dependencies --- .../ansible/roles/cac-tripplanner.app/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml index 2326dd578..08e3ec01d 100644 --- a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml +++ b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml @@ -15,16 +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: 'Pillow', version: '5.4.1' } + - { name: 'psycopg2-binary', version: '2.7.7' } + - { name: 'pytz', version: '2018.9' } - { name: 'pyyaml', version: '3.13' } - { name: 'troposphere', version: '1.8.1' } - { name: 'majorkirby', version: '0.2.1' } From 9b2a8f84a346b1e6ed2d725eca1b8b7d17f05e12 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Mon, 28 Jan 2019 11:15:49 -0500 Subject: [PATCH 3/4] Remove pyyaml pip dependency Fixes #1098. --- deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml index 08e3ec01d..883c1243e 100644 --- a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml +++ b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml @@ -25,7 +25,6 @@ cac_python_dependencies: - { name: 'Pillow', version: '5.4.1' } - { name: 'psycopg2-binary', version: '2.7.7' } - { name: 'pytz', version: '2018.9' } - - { name: 'pyyaml', version: '3.13' } - { 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 From 3c20ed3fc57b549a059ab83c66eea77acd7a3037 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Mon, 28 Jan 2019 11:16:46 -0500 Subject: [PATCH 4/4] Upgrade ansible and paramiko ansible dependencies Used by packer build. --- deployment/packer/cac.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/packer/cac.json b/deployment/packer/cac.json index 94f9c43f2..f14f3a72b 100644 --- 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" ] }, {