Merge branch 'release/3.1.4'

azavea · Aug 4, 2020 · 837ce20 · 837ce20
2 parents 260fb41 + 90ec734
commit 837ce20
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 256 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -14,8 +14,8 @@ postgresql_support_psycopg2_version: "2.8.*"
 
 packer_version: "1.5.4"
 
-nodejs_version: 12.18.2
-nodejs_npm_version: 6.14.5
+nodejs_version: 12.18.3
+nodejs_npm_version: 6.14.6
 
 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.24.0
-troposphere==2.6.1
+troposphere==2.6.2
diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,9 +1,9 @@
 base58==2.0.1
-boto3==1.14.13
-Django==2.2.13
+boto3==1.14.34
+Django==2.2.15
 django-ckeditor==5.9.0
 django-image-cropping==1.4.0
-django-extensions==3.0.1
+django-extensions==3.0.3
 django-storages==1.9.1
 easy-thumbnails==2.7
 gunicorn==20.0.4
@@ -13,4 +13,4 @@ pytz==2020.1
 PyYAML==5.3.1
 requests==2.24.0
 git+https://github.com/azavea/django-wpadmin@v2.2#egg=django-wpadmin
-virtualenv==20.0.25
+virtualenv==20.0.20