Merge branch 'release/2.6.15'

deployment/ansible/group_vars/all

@@ -11,9 +11,11 @@ postgres_host: "192.168.8.25"
 
 packer_version: "1.0.2"
 
-nodejs_version: 8.12.0
+nodejs_version: 10.15.3
+nodejs_npm_version: 6.4.1
 
-virtualenv_version: 16.1.0
+pip_version: 19.1.*
+virtualenv_version: 16.5.0
 
 otp_router: "default"
 

deployment/ansible/roles.yml

@@ -1,5 +1,5 @@
 - src: azavea.opentripplanner
-  version: 1.1.1
+  version: 1.2.0
 
 - src: azavea.nginx
   version: 0.3.1
@@ -14,7 +14,7 @@
   version: 2.0.0
 
 - src: azavea.pip
-  version: 1.0.1
+  version: 2.0.0
 
 - src: azavea.python
   version: 0.1.0

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

@@ -20,11 +20,11 @@ cac_python_dependencies:
     - { name: 'django-image-cropping', version: '1.2.0' }
     - { name: 'django-extensions', version: '1.9.9' }
     - { name: 'django-storages', version: '1.7.1' }
-    - { name: 'easy-thumbnails', version: '2.5.0' }
+    - { name: 'easy-thumbnails', version: '2.6.0' }
     - { name: 'gunicorn', version: '19.9.0' }
-    - { name: 'Pillow', version: '5.4.1' }
-    - { name: 'psycopg2-binary', version: '2.7.7' }
-    - { name: 'pytz', version: '2018.9' }
+    - { name: 'Pillow', version: '6.0.0' }
+    - { name: 'psycopg2-binary', version: '2.8.2' }
+    - { name: 'pytz', version: '2019.1' }
     - { name: 'troposphere', version: '1.8.1' }
     - { name: 'majorkirby', version: '0.2.1' }
     # Note: django-wpadmin is installed manually to work around the fact that ansible-pip

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

@@ -2,7 +2,7 @@
   dependencies:
     - { role: "azavea.git" }
     - { role: "azavea.nginx" }
-    - { role: "azavea.nodejs", nodejs_npm_version: "6.4.1" }
+    - { role: "azavea.nodejs" }
     - { role: "azavea.packer" }
     - { role: "cac-tripplanner.papertrail", when: production }
     - { role: "azavea.virtualenv" }

deployment/packer/cac.json

@@ -79,8 +79,9 @@
         "mkdir -p {{user `intermediate_directory`}}",
         "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.6"
+        "sudo pip install ansible==2.7.10"
       ]
     },
     {

python/cac_tripplanner/destinations/admin.py

@@ -52,7 +52,7 @@ class DestinationAdmin(ImageCroppingMixin, gis.admin.OSMGeoAdmin):
     map_template = 'admin/cac-geocoding-map.html'
 
     # Include geocoder dependencies
-    jquery = 'https://code.jquery.com/jquery-3.3.1.min.js'
+    jquery = 'https://code.jquery.com/jquery-3.4.0.min.js'
     if settings.DEBUG:
         extra_js = [
             jquery,

python/cac_tripplanner/templates/base.html

@@ -84,7 +84,7 @@
 
     {% block jsimports %}
 
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.0.min.js"></script>
     <script type="text/javascript">
         jQuery.noConflict(); // because JotForms.
     </script>

src/bower.json

@@ -3,8 +3,8 @@
   "private": true,
   "dependencies": {
     "console-polyfill": "~0.3.0",
-    "handlebars": "~4.1.0",
-    "jquery": "~3.3.1",
+    "handlebars": "~4.1.2",
+    "jquery": "~3.4.0",
     "leaflet": "~0.7.7",
     "cartodb.js": "~3.15.17",
     "js-storage": "~1.0.4",

src/gulpfile.js

@@ -7,6 +7,7 @@ var browserify = require('browserify');
 var concat = require('gulp-concat');
 var debug = require('gulp-debug');
 var del = require('del');
+var exec = require('child_process').exec;
 var gulp = require('gulp');
 var gulpFilter = require('gulp-filter');
 var merge = require('merge-stream');
@@ -19,8 +20,6 @@ var order = require('gulp-order');
 var plumber = require('gulp-plumber');
 var rename = require('gulp-rename');
 var replace = require('gulp-replace');
-var sequence = require('gulp-sequence');
-var shell = require('gulp-shell');
 var vinylBuffer = require('vinyl-buffer');
 var vinylSourceStream = require('vinyl-source-stream');
 
@@ -85,8 +84,17 @@ var copyBowerFiles = function(filter, extraFiles) {
     return result;
 };
 
-gulp.task('collectstatic', function () {
-    return shell.task(['python ' + pythonRoot + '/manage.py collectstatic --noinput -v0']);
+gulp.task('collectstatic', function (done) {
+    exec('python ' + pythonRoot + '/manage.py collectstatic --noinput -v0',
+        function(err, stdout, stderr) {
+            if (stdout) {
+                console.log(stdout);
+            }
+            if (stderr) {
+                console.log(stderr);
+            }
+            done(err);
+        });
 });
 
 // turf module needs to be run through browserify to pack it with its dependencies
@@ -147,8 +155,7 @@ var copyVendorJS = function(filter, extraFiles) {
 };
 
 gulp.task('clean', function() {
-    // This must be done synchronously to prevent sporadic failures
-    return del.sync([
+    return del([
         stat.fonts,
         stat.scripts,
         stat.styles,
@@ -276,10 +283,10 @@ gulp.task('test:copy-cartodb', function() {
         .pipe(gulp.dest(stat.scripts));
 });
 
-gulp.task('test:production', ['test:copy-jquery',
+gulp.task('test:production', gulp.series(gulp.series('test:copy-jquery',
                               'test:copy-cartodb',
                               'minify:vendor-scripts',
-                              'minify:scripts'],
+                              'minify:scripts'),
     function(done) {
         setTimeout(function() {
             new KarmaServer({
@@ -289,51 +296,52 @@ gulp.task('test:production', ['test:copy-jquery',
                 done();
             }).start();
         }, 6000);
-    }
+    })
 );
 
-gulp.task('test:coverage', ['test:copy-cartodb', 'copy:vendor-scripts', 'copy:scripts'],
+gulp.task('test:coverage', gulp.series(
+    gulp.series('test:copy-cartodb', 'copy:vendor-scripts', 'copy:scripts'),
     function(done) {
         setTimeout(function() {
             new KarmaServer({
                 configFile: __dirname + '/karma/karma-coverage.conf.js',
                 singleRun: true
             }, done).start();
         }, 6000);
-    }
+    })
 );
 
-gulp.task('test:development', ['copy:vendor-scripts', 'copy:scripts'],
+gulp.task('test:development', gulp.series(gulp.series('copy:vendor-scripts', 'copy:scripts'),
     function(done) {
         new KarmaServer({
             configFile: __dirname + '/karma/karma-dev.conf.js',
             singleRun: true
         }, done).start();
-    }
+    })
 );
 
-gulp.task('common:build', ['clean'], sequence([
-        'copy:fontello-fonts',
-        'copy:vendor-css',
-        'copy:vendor-images',
-        'copy:marker-images',
-        'copy:app-images',
-        'sass',
-        'collectstatic'])
+gulp.task('common:build', gulp.series('clean',
+    'copy:fontello-fonts',
+    'copy:vendor-css',
+    'copy:vendor-images',
+    'copy:marker-images',
+    'copy:app-images',
+    'sass',
+    'collectstatic')
 );
 
-gulp.task('test', sequence([
-            'test:copy-jquery',
-            'test:copy-cartodb',
-            'production',
-            'test:production',
-            'development',
-            'test:coverage'])
-);
+gulp.task('development', gulp.series('common:build', 'copy:vendor-scripts', 'copy:scripts'));
 
-gulp.task('development', ['common:build', 'copy:vendor-scripts', 'copy:scripts']);
+gulp.task('production', gulp.series('common:build', 'minify:scripts', 'minify:vendor-scripts'));
 
-gulp.task('production', ['common:build', 'minify:scripts', 'minify:vendor-scripts']);
+gulp.task('test', gulp.series(
+    'test:copy-jquery',
+    'test:copy-cartodb',
+    'production',
+    'test:production',
+    'development',
+    'test:coverage')
+);
 
 gulp.task('watch', function () {
     return gulp.watch([
@@ -343,4 +351,4 @@ gulp.task('watch', function () {
     ], ['development']);
 });
 
-gulp.task('default', ['production']);
+gulp.task('default', gulp.series('production'));