From 9e8c11667d12a042538d2f98103aa4651c0fe222 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 9 Mar 2018 14:37:57 -0500 Subject: [PATCH 1/6] Upgrade to node 8 Update to use latest stable node release. --- deployment/ansible/group_vars/all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index 82d64e30b..ebc8f9822 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -3,7 +3,7 @@ app_username: "vagrant" packer_version: "0.7.5" -nodejs_version: 6.11.4 +nodejs_version: 8.10.0 virtualenv_version: 15.1.0 From 6bf5c7ef1f9c1741a137228fa3c308a5e295aa54 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 9 Mar 2018 14:38:15 -0500 Subject: [PATCH 2/6] Update npm packages --- src/package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/package.json b/src/package.json index 1d9731372..f015d92f2 100644 --- a/src/package.json +++ b/src/package.json @@ -11,40 +11,40 @@ "aliasify": "^2.0.0", "apache-server-configs": "~2.15.0", "bower": "~1.8.2", - "browserify": "~14.5.0", + "browserify": "~16.1.1", "chai": "~4.1.2", "connect": "~3.6.5", "connect-livereload": "~0.6.0", "del": "~3.0.0", "gulp": "~3.9.1", "gulp-add-src": "~0.2.0", - "gulp-autoprefixer": "~4.0.0", + "gulp-autoprefixer": "~5.0.0", "gulp-cache": "~1.0.1", "gulp-concat": "~2.6.1", "gulp-csso": "~3.0.0", - "gulp-debug": "~3.1.0", - "gulp-filter": "~5.0.1", - "gulp-flatten": "~0.3.1", + "gulp-debug": "~3.2.0", + "gulp-filter": "~5.1.0", + "gulp-flatten": "~0.4.0", "gulp-if": "~2.0.2", - "gulp-imagemin": "~4.0.0", - "gulp-jshint": "~2.0.4", + "gulp-imagemin": "~4.1.0", + "gulp-jshint": "~2.1.0", "gulp-jshint-xml-file-reporter": "~0.5.1", "gulp-load-plugins": "~1.5.0", "gulp-order": "~1.1.1", - "gulp-plumber": "~1.1.0", + "gulp-plumber": "~1.2.0", "gulp-rename": "~1.2.2", "gulp-replace": "~0.6.1", "gulp-sass": "~3.1.0", - "gulp-sequence": "~0.4.6", + "gulp-sequence": "~1.0.0", "gulp-shell": "^0.6.3", - "gulp-size": "~2.1.0", + "gulp-size": "~3.0.0", "gulp-uglify": "~3.0.0", "gulp-useref": "~3.1.2", "istanbul": "~0.4.5", - "jasmine-core": "~2.8.0", + "jasmine-core": "~3.1.0", "jshint": "~2.9.3", "jshint-stylish": "~2.2.1", - "karma": "~1.7.1", + "karma": "~2.0.0", "karma-chai": "~0.1.0", "karma-coverage": "~1.1.1", "karma-jasmine": "~1.1.0", @@ -53,15 +53,15 @@ "lazypipe": "~1.0.1", "main-bower-files": "~2.13.1", "merge-stream": "~1.0.0", - "mocha": "~4.0.1", - "opn": "~5.1.0", - "pump": "~1.0.2", + "mocha": "~5.0.4", + "opn": "~5.2.0", + "pump": "~3.0.0", "requirejs": "~2.3.5", "serve-index": "~1.9.1", "serve-static": "~1.13.1", - "uglify-es": "^3.1.3", + "uglify-es": "^3.3.9", "vinyl-buffer": "~1.0.0", - "vinyl-source-stream": "~1.1.0", + "vinyl-source-stream": "~2.0.0", "wiredep": "~4.0.0" }, "scripts": { From c7291071b548c96730325a2c229a596d3ffdc395 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 9 Mar 2018 14:38:38 -0500 Subject: [PATCH 3/6] Update django dependencies --- .../roles/cac-tripplanner.app/defaults/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml index 804ba4bfc..db451cc84 100644 --- a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml +++ b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml @@ -19,14 +19,14 @@ root_media_dir: "/media/cac" cac_python_dependencies: - { name: 'base58', version: '0.2.5' } - { name: 'boto', version: '2.48.0' } - - { name: 'django', version: '1.11.7' } - - { name: 'django-ckeditor', version: '5.3.1' } - - { name: 'django-extensions', version: '1.9.7' } + - { name: 'django', version: '1.11.11' } + - { name: 'django-ckeditor', version: '5.4.0' } + - { name: 'django-extensions', version: '1.9.9' } - { name: 'django-storages', version: '1.6.5' } - { name: 'gunicorn', version: '19.7.1' } - - { name: 'pillow', version: '4.3.0' } - - { name: 'psycopg2', version: '2.7.3' } - - { name: 'pytz', version: '2017.3' } + - { name: 'pillow', version: '5.0.0' } + - { name: 'psycopg2', version: '2.7.4' } + - { name: 'pytz', version: '2018.3' } - { name: 'pyyaml', version: '3.12' } - { name: 'troposphere', version: '0.7.2'} # Note: django-wpadmin is installed manually to work around the fact that ansible-pip From 6b7ba2dadfa2b55958b11f97598e065d2bf3a69f Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 9 Mar 2018 14:38:51 -0500 Subject: [PATCH 4/6] Upgrade ansible roles --- deployment/ansible/roles.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index 37a48d2e5..ca38fe9b1 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -2,13 +2,13 @@ version: 0.1.0 - src: azavea.java - version: 0.2.6 + version: 0.6.1 - src: azavea.opentripplanner version: 1.0.8 - src: azavea.nginx - version: 0.2.2 + version: 0.3.1 - src: azavea.nodejs version: 0.4.0 @@ -17,7 +17,7 @@ version: 0.2.0 - src: azavea.papertrail - version: 1.1.1 + version: 1.2.0 - src: azavea.pip version: 1.0.0 From 71585aa2d356d3f14596c8ddc74be04ca1dea40d Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Tue, 13 Mar 2018 11:48:03 -0400 Subject: [PATCH 5/6] Do not explicitly name transient roles git and java roles are dependencies of opentripplanner role, so do not also name them here. --- deployment/ansible/roles.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index ca38fe9b1..4168b3fdc 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -1,9 +1,3 @@ -- src: azavea.git - version: 0.1.0 - -- src: azavea.java - version: 0.6.1 - - src: azavea.opentripplanner version: 1.0.8 From 118830e95555a5fa5510019c019cfc6e4a869188 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Tue, 13 Mar 2018 13:59:20 -0400 Subject: [PATCH 6/6] Revert npm package updates Broke test runner. --- src/package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/package.json b/src/package.json index f015d92f2..1d9731372 100644 --- a/src/package.json +++ b/src/package.json @@ -11,40 +11,40 @@ "aliasify": "^2.0.0", "apache-server-configs": "~2.15.0", "bower": "~1.8.2", - "browserify": "~16.1.1", + "browserify": "~14.5.0", "chai": "~4.1.2", "connect": "~3.6.5", "connect-livereload": "~0.6.0", "del": "~3.0.0", "gulp": "~3.9.1", "gulp-add-src": "~0.2.0", - "gulp-autoprefixer": "~5.0.0", + "gulp-autoprefixer": "~4.0.0", "gulp-cache": "~1.0.1", "gulp-concat": "~2.6.1", "gulp-csso": "~3.0.0", - "gulp-debug": "~3.2.0", - "gulp-filter": "~5.1.0", - "gulp-flatten": "~0.4.0", + "gulp-debug": "~3.1.0", + "gulp-filter": "~5.0.1", + "gulp-flatten": "~0.3.1", "gulp-if": "~2.0.2", - "gulp-imagemin": "~4.1.0", - "gulp-jshint": "~2.1.0", + "gulp-imagemin": "~4.0.0", + "gulp-jshint": "~2.0.4", "gulp-jshint-xml-file-reporter": "~0.5.1", "gulp-load-plugins": "~1.5.0", "gulp-order": "~1.1.1", - "gulp-plumber": "~1.2.0", + "gulp-plumber": "~1.1.0", "gulp-rename": "~1.2.2", "gulp-replace": "~0.6.1", "gulp-sass": "~3.1.0", - "gulp-sequence": "~1.0.0", + "gulp-sequence": "~0.4.6", "gulp-shell": "^0.6.3", - "gulp-size": "~3.0.0", + "gulp-size": "~2.1.0", "gulp-uglify": "~3.0.0", "gulp-useref": "~3.1.2", "istanbul": "~0.4.5", - "jasmine-core": "~3.1.0", + "jasmine-core": "~2.8.0", "jshint": "~2.9.3", "jshint-stylish": "~2.2.1", - "karma": "~2.0.0", + "karma": "~1.7.1", "karma-chai": "~0.1.0", "karma-coverage": "~1.1.1", "karma-jasmine": "~1.1.0", @@ -53,15 +53,15 @@ "lazypipe": "~1.0.1", "main-bower-files": "~2.13.1", "merge-stream": "~1.0.0", - "mocha": "~5.0.4", - "opn": "~5.2.0", - "pump": "~3.0.0", + "mocha": "~4.0.1", + "opn": "~5.1.0", + "pump": "~1.0.2", "requirejs": "~2.3.5", "serve-index": "~1.9.1", "serve-static": "~1.13.1", - "uglify-es": "^3.3.9", + "uglify-es": "^3.1.3", "vinyl-buffer": "~1.0.0", - "vinyl-source-stream": "~2.0.0", + "vinyl-source-stream": "~1.1.0", "wiredep": "~4.0.0" }, "scripts": {