Merge branch 'release/3.1.2'

azavea · Jun 1, 2020 · 60a7fa6 · 60a7fa6
2 parents 9faaf8d + 3cb7eee
commit 60a7fa6
Show file tree

Hide file tree

Showing 5 changed files with 752 additions and 1,006 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -14,7 +14,7 @@ postgresql_support_psycopg2_version: "2.8.*"
 
 packer_version: "1.5.4"
 
-nodejs_version: 12.16.3
+nodejs_version: 12.17.0
 nodejs_npm_version: 6.14.4
 
 otp_router: "default"

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.3.1
 majorkirby==1.0.0
 requests==2.23.0
-troposphere==2.6.0
+troposphere==2.6.1
diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,5 +1,5 @@
 base58==2.0.0
-boto3==1.12.47
+boto3==1.13.19
 Django==2.2.12
 django-ckeditor==5.9.0
 django-image-cropping==1.4.0
@@ -13,4 +13,4 @@ pytz==2020.1
 PyYAML==5.3.1
 requests==2.23.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
-virtualenv==20.0.18
+virtualenv==20.0.21