Merge branch 'release/1.32.1'

WikiWatershed · Mar 31, 2021 · eec8096 · eec8096
2 parents 87bf154 + 2e38546
commit eec8096
Show file tree

Hide file tree

Showing 7 changed files with 1,190 additions and 999 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Local Development
 
-A combination of Vagrant 2.2+ and Ansible 2.x+ is used to setup the development environment for this project. The project consists of the following virtual machines:
+A combination of Vagrant 2.2+ and Ansible 2.5+ is used to setup the development environment for this project. The project consists of the following virtual machines:
 
 - `app`
 - `services`

diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
@@ -1,7 +1,7 @@
 - src: azavea.ntp
   version: 0.1.1
 - src: azavea.pip
-  version: 2.0.0
+  version: 2.0.1
 - src: azavea.nodejs
   version: 0.3.0
 - src: azavea.yarn

diff --git a/deployment/ansible/roles/model-my-watershed.rwd/tasks/app.yml b/deployment/ansible/roles/model-my-watershed.rwd/tasks/app.yml
@@ -7,7 +7,7 @@
   docker_service:
     project_name: mmw
     state: present
-    definition: 
+    definition:
       version: "3"
       services:
         mmw-rwd:
@@ -22,4 +22,3 @@
             driver: syslog
             options:
               tag: mmw-rwd
-
diff --git a/src/mmw/js/src/modeling/constants.js b/src/mmw/js/src/modeling/constants.js
@@ -27,16 +27,16 @@ module.exports = {
     },
     // In sync with apps.modeling.models.WeatherType.simulations
     Simulations: [
-        {
-            group: 'Recent Weather',
-            items: [
-                {
-                    name: 'NASA_NLDAS_2000_2019',
-                    label: 'NASA NLDAS 2000-2019',
-                },
-            ],
-            in_drb: true,
-        },
+        // {
+        //     group: 'Recent Weather',
+        //     items: [
+        //         {
+        //             name: 'NASA_NLDAS_2000_2019',
+        //             label: 'NASA NLDAS 2000-2019',
+        //         },
+        //     ],
+        //     in_drb: true,
+        // },
         {
             group: 'Future Weather Simulations',
             items: [

diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py
@@ -459,7 +459,7 @@ def get_env_setting(setting):
 # Drexel Fast Zonal API Settings
 DREXEL_FAST_ZONAL_API = {
     'url': environ.get('MMW_DREXEL_FAST_ZONAL_API_URL',
-                       'http://watersheds.cci.drexel.edu/api/fzs_buildout/'),
+                       'https://watersheds.cci.drexel.edu/api/fzs_buildout/'),
     'keys': ['centers', 'centers_np', 'centers_osi',
              'corridors', 'corridors_np', 'corridors_osi'],
 }

diff --git a/src/mmw/package.json b/src/mmw/package.json
@@ -24,7 +24,7 @@
     "blueimp-md5": "1.1.0",
     "bootstrap": "3.4.1",
     "bootstrap-datepicker": "1.7.1",
-    "bootstrap-select": "1.12.4",
+    "bootstrap-select": "1.13.18",
     "bootstrap-table": "1.11.0",
     "browserify": "16.5.0",
     "chai": "1.10.0",
@@ -43,16 +43,16 @@
     "livereload": "0.8.2",
     "lodash": "4.17.19",
     "minifyify": "7.0.0",
-    "mocha": "6.2.2",
+    "mocha": "8.3.0",
     "moment": "2.24.0",
-    "node-sass": "4.12.0",
+    "node-sass": "5.0.0",
     "nunjucks": "1.3.4",
     "nunjucksify": "0.2.2",
     "reproject": "1.1.1",
     "retina.js": "git://github.com/imulus/retinajs#1.3.0",
     "shapefile": "0.6.2",
     "sinon": "1.14.1",
-    "testem": "3.0.0",
+    "testem": "3.2.0",
     "turf-area": "1.1.1",
     "turf-bbox-polygon": "1.0.1",
     "turf-centroid": "3.0.12",