Merge branch 'release/2.7.1'

azavea · Sep 3, 2019 · 9d415e4 · 9d415e4
2 parents 3133361 + 5ca0d26
commit 9d415e4
Show file tree

Hide file tree

Showing 8 changed files with 546 additions and 724 deletions.
diff --git a/deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml
@@ -7,6 +7,8 @@
     pkg:
       - binutils
       - bzip2
+      - chromium-browser
+      - g++
       - gdal-bin
       - libpq-dev
       - libproj-dev

diff --git a/python/cac_tripplanner/deployment_requirements.txt b/python/cac_tripplanner/deployment_requirements.txt
@@ -1,5 +1,5 @@
 boto==2.49.0
-PyYAML==5.1.1
+PyYAML==5.1.2
 requests==2.22.0
-troposphere==2.5.0
+troposphere==2.5.1
 majorkirby==1.0.0
diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,6 +1,6 @@
 base58==1.0.3
 boto==2.49.0
-Django==1.11.22
+Django==1.11.24
 django-ckeditor==5.7.1
 django-image-cropping==1.2.0
 django-extensions==1.9.9
@@ -9,7 +9,7 @@ easy-thumbnails==2.6.0
 gunicorn==19.9.0
 Pillow==6.1.0
 psycopg2-binary==2.8.3
-pytz==2019.1
-PyYAML==5.1.1
+pytz==2019.2
+PyYAML==5.1.2
 requests==2.22.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
diff --git a/src/karma/karma-coverage.conf.js b/src/karma/karma-coverage.conf.js
@@ -116,11 +116,18 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+    browsers: ['ChromeHeadless'],
 
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
+    singleRun: true,
+
+    customLaunchers: {
+      ChromeHeadless: {
+        base: 'Chromium',
+        flags: ['--no-sandbox', '--disable-gpu', '--headless', '--remote-debugging-port=9222']
+      }
+    }
   });
 };
diff --git a/src/karma/karma-dev.conf.js b/src/karma/karma-dev.conf.js
@@ -117,11 +117,18 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+    browsers: ['ChromeHeadless'],
 
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
+    singleRun: true,
+
+    customLaunchers: {
+      ChromeHeadless: {
+        base: 'Chromium',
+        flags: ['--no-sandbox', '--disable-gpu', '--headless', '--remote-debugging-port=9222']
+      }
+    }
   });
 };
diff --git a/src/karma/karma.conf.js b/src/karma/karma.conf.js
@@ -52,11 +52,18 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+    browsers: ['ChromeHeadless'],
 
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
+    singleRun: true,
+
+    customLaunchers: {
+      ChromeHeadless: {
+        base: 'Chromium',
+        flags: ['--no-sandbox', '--disable-gpu', '--headless', '--remote-debugging-port=9222']
+      }
+    }
   });
 };