Merge branch 'release/2.8.0'

Vagrantfile

@@ -71,7 +71,7 @@ VAGRANT_PROXYCONF_ENDPOINT = ENV["VAGRANT_PROXYCONF_ENDPOINT"]
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "bento/ubuntu-16.04"
+  config.vm.box = "bento/ubuntu-18.04"
 
   # Wire up the proxy if:
   #

deployment/ansible/group_vars/all

@@ -9,16 +9,20 @@ postgres_user: "cac_tripplanner"
 postgres_password: "cac_tripplanner"
 postgres_host: "192.168.8.25"
 
-packer_version: "1.0.2"
+packer_version: "1.4.4"
 
+# Python 2 version used where python 2 interpreter needed
 python_version: "2.7.*"
 
-nodejs_version: 10.16.0
-nodejs_npm_version: 6.10.2
+nodejs_version: 12.11.1
+nodejs_npm_version: 6.11.3
 
 pip_version: 19.2.*
 virtualenv_version: 16.5.0
 
+otp_version: "1.4.0"
+otp_jar_sha1: "0367b1a15bac5f587807a5b897a9734209f8135c"
+
 otp_router: "default"
 
 # used by nginx and gunicorn to set timeouts; OTP defaults to 30s

deployment/ansible/roles.yml

@@ -19,9 +19,6 @@
 - src: azavea.python
   version: 0.1.0
 
-- src: azavea.virtualenv
-  version: 0.1.0
-
 - src: azavea.postgresql-support
   version: 0.4.0
 

deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml

@@ -2,6 +2,9 @@
 django_workers: 5
 production: False
 
+# Use python 3 on app VM
+ansible_python_interpreter: "/usr/bin/python3"
+
 app_sass_version: "3.4.22"
 
 app_log: "/var/log/cac-tripplanner-app.log"

deployment/ansible/roles/cac-tripplanner.app/meta/main.yml

@@ -5,4 +5,4 @@
     - { role: "azavea.nodejs" }
     - { role: "azavea.packer" }
     - { role: "cac-tripplanner.papertrail", when: production }
-    - { role: "azavea.virtualenv" }
+    - { role: "cac-tripplanner.python3" }

deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml

@@ -1,26 +1,21 @@
 ---
-# # Note bzip2 only installed here as workaround for unresolved but closed phantomjs
-# install issue: https://github.com/Medium/phantomjs/issues/659
 - name: Install packages
   apt:
     state: present
     pkg:
       - binutils
-      - bzip2
       - chromium-browser
       - g++
       - gdal-bin
       - libpq-dev
       - libproj-dev
-      - python-dev
-      - python3-pip
       - libjpeg-dev
 
-- name: Install pip packages to python3 for deployment
+- name: Install pip packages for deployment
   pip: requirements={{ root_app_dir }}/deployment_requirements.txt executable=/usr/bin/pip3
 
-- name: Install pip packages
-  pip: requirements={{ root_app_dir }}/requirements.txt
+- name: Install pip packages for app
+  pip: requirements={{ root_app_dir }}/requirements.txt executable=/usr/bin/pip3
 
 - name: Touch log file and set permissions
   file: path={{ app_log }} state=touch owner={{ app_username }} group={{ app_username }} mode=0664

deployment/ansible/roles/cac-tripplanner.database/tasks/install-postgis-from-source.yml

@@ -7,7 +7,7 @@
       - libgeos-dev
       - libgdal-dev
       - libproj-dev
-      - libjson0-dev
+      - libjson-c-dev
       - libxml2-dev
       - libxml2-utils
       - xsltproc

deployment/ansible/roles/cac-tripplanner.otp-data/defaults/main.yml

@@ -1,3 +1,6 @@
 ---
 bikeshare_update_interval_s: 120
 bikeshare_update_url: 'https://gbfs.bcycle.com/bcycle_indego/'
+
+# Use python 3 on OTP VM
+ansible_python_interpreter: "/usr/bin/python3"

deployment/ansible/roles/cac-tripplanner.otp-data/meta/main.yml

@@ -1,5 +1,4 @@
 ---
   dependencies:
-    - { role: "cac-tripplanner.transitfeed" }
     - { role: "azavea.opentripplanner" }
     - { role: "cac-tripplanner.papertrail", when: production }

deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml

@@ -2,9 +2,6 @@
 - name: Create Directory for OSM and GTFS
   file: path={{ otp_data_dir }} state=directory owner={{ otp_user }}
 
-- name: Copy Feed Validator
-  copy: src=validate_feed.py dest="{{ otp_data_dir }}"
-
 - name: Install AuthBind (for serving OTP on port 80)
   apt: pkg=authbind state=present
 

deployment/ansible/roles/cac-tripplanner.python3/tasks/main.yml

@@ -0,0 +1,10 @@
+---
+- name: Install Python 3 packages
+  apt:
+    state: present
+    pkg:
+      - build-essential
+      - python3
+      - python3-dev
+      - python3-pip
+      - python3-venv

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.4.2",
-        "sudo pip install ansible==2.7.10"
+        "sudo pip install paramiko==2.6.0",
+        "sudo pip install ansible==2.8.2"
       ]
     },
     {

python/cac_tripplanner/cac_tripplanner/custom_storages.py

@@ -1,5 +1,6 @@
-import urllib
-import urlparse
+import urllib.request
+import urllib.parse
+import urllib.error
 
 from storages.backends.s3boto import S3BotoStorage
 
@@ -22,9 +23,9 @@ def __init__(self, *a, **k):
 
     def url(self, name):
         orig = super(PublicS3BotoStorage, self).url(name)
-        scheme, netloc, path, params, query, fragment = urlparse.urlparse(orig)
-        params = urlparse.parse_qs(query)
+        scheme, netloc, path, params, query, fragment = urllib.parse.urlparse(orig)
+        params = urllib.parse.parse_qs(query)
         if 'x-amz-security-token' in params:
             del params['x-amz-security-token']
-        query = urllib.urlencode(params)
-        return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+        query = urllib.parse.urlencode(params)
+        return urllib.parse.urlunparse((scheme, netloc, path, params, query, fragment))

python/cac_tripplanner/cac_tripplanner/settings.py

@@ -19,6 +19,12 @@
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
+# Tell image cropping library to use Django admin jquery,
+# or else loading the image cropper will fail for destinations admin
+# because it loads jquery for gis.admin.OSMGeoAdmin
+IMAGE_CROPPING_JQUERY_URL = '/static/admin/js/vendor/jquery/jquery.js'
+
+
 try:
     secrets = yaml.safe_load(open('/etc/cac_secrets', 'r'))
 except (IOError, NameError):
@@ -121,14 +127,14 @@
     'shortlinks',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware'
 )
 
 ROOT_URLCONF = 'cac_tripplanner.urls'

python/cac_tripplanner/cac_tripplanner/urls.py

@@ -1,4 +1,5 @@
-from django.conf.urls import include, url
+from django.conf.urls import url
+from django.urls import include
 from django.views.generic import RedirectView
 from django.contrib.gis import admin
 
@@ -7,7 +8,7 @@
 from cms import views as cms_views
 from destinations import views as dest_views
 
-import settings
+from django.conf import settings
 
 urlpatterns = [
     # Home view, which is also the directions and explore views
@@ -51,9 +52,9 @@
     url(r'^learn/(?P<slug>[\w-]+)/$', cms_views.learn_detail, name='learn-detail'),
 
     # Link Shortening
-    url(r'^link/', include('shortlinks.urls')),
+    url(r'^link/', include('shortlinks.urls', namespace='shortlinks')),
 
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 if settings.DEBUG:

python/cac_tripplanner/cms/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings
@@ -24,7 +24,8 @@ class Migration(migrations.Migration):
                 ('published', models.BooleanField(default=False)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('modified', models.DateTimeField(auto_now=True)),
-                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL,
+                                             on_delete=models.CASCADE)),
             ],
             options={
             },

python/cac_tripplanner/cms/migrations/0002_auto_20150122_0936.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

python/cac_tripplanner/cms/migrations/0003_remove_article_published.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

python/cac_tripplanner/cms/migrations/0004_add_image_fields.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 import cms.models

python/cac_tripplanner/cms/migrations/0005_add_default_admin_user.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings

python/cac_tripplanner/cms/migrations/0006_aboutfaq.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings
@@ -24,7 +24,8 @@ class Migration(migrations.Migration):
                 ('publish_date', models.DateTimeField(null=True, blank=True)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('modified', models.DateTimeField(auto_now=True)),
-                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL,
+                                             on_delete=models.CASCADE)),
             ],
             options={
             },

python/cac_tripplanner/cms/migrations/0007_add_defalut_aboutfaq.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.utils import timezone

python/cac_tripplanner/cms/migrations/0008_auto_20150507_1015.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 import cms.models

python/cac_tripplanner/cms/migrations/0009_auto_20150515_1248.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 import cms.models

python/cac_tripplanner/cms/migrations/0010_auto_20170201_1527.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import cms.models