Merge branch 'release/3.0.2'

azavea · Jan 6, 2020 · 8b6ff17 · 8b6ff17
2 parents 6ce7ef9 + 83786c7
commit 8b6ff17
Show file tree

Hide file tree

Showing 10 changed files with 924 additions and 531 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -10,7 +10,7 @@ postgres_password: "cac_tripplanner"
 postgres_host: "192.168.8.25"
 
 postgresql_support_psycopg2_version: "2.8.*"
-'postgis_version': [2, 1, 8]
+'postgis_version': [2, 5, 2]
 
 packer_version: "1.4.4"
 

diff --git a/deployment/ansible/group_vars/development_template b/deployment/ansible/group_vars/development_template
@@ -9,7 +9,7 @@ otp_process_mem: 5G
 # for cac_secrets
 allowed_hosts: ['127.0.0.1', 'localhost']
 internal_ips: ['0.0.0.0', '127.0.0.1']
-postgis_version: [2, 1, 8]
+postgis_version: [2, 5, 2]
 aws_access_key_id: ''
 aws_secret_access_key: ''
 aws_storage_bucket_name: ''
@@ -26,8 +26,8 @@ default_admin_username: 'admin'
 default_admin_password: 'admin'
 default_admin_email: 'systems+cac@azavea.com'
 
-postgresql_version: "9.5"
-postgresql_package_version: "9.5.*"
+postgresql_version: "9.6"
+postgresql_package_version: "9.6.*"
 postgresql_support_libpq_version: "*"
 
 postgresql_listen_addresses: "*"

diff --git a/deployment/ansible/group_vars/test b/deployment/ansible/group_vars/test
@@ -3,10 +3,10 @@ test: true
 develop: false
 production: false
 
-postgis_version: [2, 1, 8]
+postgis_version: [2, 5, 2]
 
-postgresql_version: "9.5"
-postgresql_package_version: "9.5.*"
+postgresql_version: "9.6"
+postgresql_package_version: "9.6.*"
 postgresql_support_libpq_version: "*"
 
 postgresql_listen_addresses: "*"

diff --git a/deployment/packer/cac.json b/deployment/packer/cac.json
@@ -73,9 +73,9 @@
     {
       "type": "shell",
       "inline": [
-        "sleep 10",
+        "sleep 20",
         "sudo apt-get update",
-        "sleep 30",
+        "sleep 60",
         "mkdir -p {{user `ansible_staging_directory`}}",
         "mkdir -p {{user `intermediate_directory`}}",
         "sudo apt-get -y install python3-dev python3-pip git",

diff --git a/python/cac_tripplanner/cac_tripplanner/settings.py b/python/cac_tripplanner/cac_tripplanner/settings.py
@@ -47,7 +47,7 @@
         # to the host machine's DNS here, because this code runs in a VM.
         'otp_url': 'http://192.168.8.26/otp/routers/{router}/',
         'internal_ips': ['0.0.0.0', '127.0.0.1'],
-        'postgis_version': [2, 1, 8],
+        'postgis_version': [2, 5, 2],
         'build_dir': '/opt/app/src',
         'production': False,
 

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.2
 majorkirby==1.0.0
 requests==2.22.0
-troposphere==2.5.2
+troposphere==2.5.3
diff --git a/python/cac_tripplanner/destinations/admin.py b/python/cac_tripplanner/destinations/admin.py
@@ -3,6 +3,7 @@
 
 from django.conf import settings
 from django.contrib import admin, gis
+from django import forms
 
 from image_cropping import ImageCroppingMixin
 
@@ -114,6 +115,11 @@ def save_ordered_formset(form, formset, OrderedDestination, related_field):
     # commit save here to assign IDs to any newly added destinations
     instances = formset.save(commit=True)
 
+    # do not attempt to fix orders if there are none on the form
+    # (handle other formset types)
+    if len(instances) > 0 and not hasattr(instances[0], 'order'):
+        return
+
     # Normalize the ordering of the destinations
     instance_id = form.instance.id
     # get a list of dicts with 'order' and related 'id' properties

diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,16 +1,16 @@
 base58==1.0.3
 boto==2.49.0
-Django==2.2.8
+Django==2.2.9
 django-ckeditor==5.8.0
-django-image-cropping==1.2.0
+django-image-cropping==1.3.0
 django-extensions==2.2.5
 django-storages==1.8
-easy-thumbnails==2.6.0
+easy-thumbnails==2.7
 gunicorn==20.0.4
-Pillow==6.2.1
+Pillow==7.0.0
 psycopg2-binary==2.8.4
 pytz==2019.3
 PyYAML==5.2
 requests==2.22.0
 git+https://github.com/azavea/django-wpadmin@v2.2#egg=django-wpadmin
-virtualenv==16.7.8
+virtualenv==16.7.9