Merge branch 'release/2.8.1'

azavea · Nov 6, 2019 · cac622b · cac622b
2 parents ed99b92 + a36cead
commit cac622b
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 291 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -14,11 +14,11 @@ packer_version: "1.4.4"
 # Python 2 version used where python 2 interpreter needed
 python_version: "2.7.*"
 
-nodejs_version: 12.11.1
-nodejs_npm_version: 6.11.3
+nodejs_version: 12.13.0
+nodejs_npm_version: 6.12.0
 
-pip_version: 19.2.*
-virtualenv_version: 16.5.0
+pip_version: 19.3.*
+virtualenv_version: 16.7.7
 
 otp_version: "1.4.0"
 otp_jar_sha1: "0367b1a15bac5f587807a5b897a9734209f8135c"

diff --git a/deployment/ansible/roles/cac-tripplanner.database/meta/main.yml b/deployment/ansible/roles/cac-tripplanner.database/meta/main.yml
@@ -1,4 +1,3 @@
 ---
   dependencies:
     - { role: "azavea.postgresql" }
-    - { role: "azavea.postgresql-support" }
diff --git a/deployment/ansible/roles/cac-tripplanner.database/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.database/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
+- name: Install GCC for PostgreSQL support role
+  apt:
+    state: present
+    pkg: gcc
+
+- name: Dynamically include PostgreSQL support role
+  include_role:
+    name: azavea.postgresql-support
+
 - name: Install PostGIS extension from source
   import_tasks: install-postgis-from-source.yml
 

diff --git a/deployment/packer/cac.json b/deployment/packer/cac.json
@@ -80,8 +80,8 @@
         "sudo apt-get -y install build-essential python-dev python-pip git",
         "sudo pip install --upgrade pip",
         "sudo pip install --upgrade setuptools",
-        "sudo pip install paramiko==2.6.0",
-        "sudo pip install ansible==2.8.2"
+        "sudo pip install --upgrade paramiko",
+        "sudo pip install --upgrade ansible"
       ]
     },
     {

diff --git a/python/cac_tripplanner/deployment_requirements.txt b/python/cac_tripplanner/deployment_requirements.txt
@@ -2,4 +2,4 @@ boto==2.49.0
 PyYAML==5.1.2
 majorkirby==1.0.0
 requests==2.22.0
-troposphere==2.5.1
+troposphere==2.5.2
diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -3,14 +3,14 @@ boto==2.49.0
 Django==2.2.4
 django-ckeditor==5.7.1
 django-image-cropping==1.2.0
-django-extensions==2.2.1
-django-storages==1.7.1
+django-extensions==2.2.5
+django-storages==1.7.2
 easy-thumbnails==2.6.0
 gunicorn==19.9.0
-Pillow==6.1.0
-psycopg2-binary==2.8.3
-pytz==2019.2
+Pillow==6.2.1
+psycopg2-binary==2.8.4
+pytz==2019.3
 PyYAML==5.1.2
 requests==2.22.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
-virtualenv==16.7.4
+virtualenv==16.7.7