Merge branch 'release/1.24.2'

.gitignore

@@ -61,6 +61,7 @@ target/
 
 # Ansible
 deployment/ansible/roles/azavea.*
+*.retry
 
 # CloudFormation
 deployment/default.yml

deployment/ansible/group_vars/all

@@ -25,7 +25,7 @@ postgresql_database: mmw
 postgresql_version: "9.4"
 postgresql_package_version: "9.4.*.pgdg14.04+1"
 postgresql_support_repository_channel: "main"
-postgresql_support_libpq_version: "11.1-1.pgdg14.04+1"
+postgresql_support_libpq_version: "11.*.pgdg14.04+1"
 postgresql_support_psycopg2_version: "2.7"
 postgis_version: "2.2"
 postgis_package_version: "2.2.*.pgdg14.04+1"
@@ -60,5 +60,6 @@ observation_api_url: "http://www.wikiwatershed-vs.org/"
 enabled_features: ''
 
 numba_version: "0.38.1"
+numpy_version: "1.14.5"
 
 redis_version: "2:2.8.4-2ubuntu0.2"

deployment/ansible/roles/model-my-watershed.app/tasks/dependencies.yml

@@ -2,6 +2,9 @@
 - name: Install numba
   pip: name=numba version={{ numba_version }}
 
+- name: Install numpy
+  pip: name=numpy version={{ numpy_version }}
+
 - name: Install application Python dependencies for development and test
   pip: requirements="{{ app_home }}/requirements/{{ item }}.txt"
   with_items:

deployment/ansible/roles/model-my-watershed.celery-worker/tasks/celery-service.yml

@@ -13,3 +13,10 @@
 
 - name: Enable Celery service
   service: name=celeryd enabled=yes state=started
+
+- name: Setup daily Celery service restart
+  cron:
+    name: celery-restart
+    special_time: daily
+    job: service celeryd restart
+    state: present

deployment/ansible/roles/model-my-watershed.celery-worker/tasks/dependencies.yml

@@ -2,6 +2,9 @@
 - name: Install numba
   pip: name=numba version={{ numba_version }}
 
+- name: Install numpy
+  pip: name=numpy version={{ numpy_version }}
+
 - name: Install application Python dependencies for development and test
   pip: requirements="{{ app_home }}/requirements/{{ item }}.txt"
   with_items:

deployment/packer/template.js

@@ -112,7 +112,7 @@
                 "sleep 5",
                 "sudo apt-get update -qq",
                 "sudo apt-get install python-pip python-dev -y",
-                "sudo pip install --upgrade pip",
+                "sudo pip install --upgrade pip==18.1",
                 "sudo pip install ansible==2.4.4.0",
                 "sudo /bin/sh -c 'echo {{user `branch`}} {{user `description`}} > /srv/version.txt'"
             ]

deployment/requirements.txt

@@ -1,5 +1,5 @@
 ansible==2.4.4.0
 majorkirby>=0.2.0,<0.2.99
-troposphere>=1.1.0
+troposphere==1.1.0
 boto==2.39.0
 awscli>=1.9.15

src/mmw/apps/core/tasks.py

@@ -32,15 +32,14 @@ def save_job_error(request, exc, traceback, job_id):
     try:
         job = Job.objects.get(id=job_id)
         job.error = exc
-        job.traceback = traceback
+        job.traceback = traceback or 'No traceback'
         job.delivered_at = now()
         job.status = 'failed'
         job.save()
     except Exception as e:
         logger.error('Failed to save job error status. Job will appear hung. \
                      Job Id: {0}'.format(job.id))
-        logger.error('Error number: {0} - Error: {1}'
-                     .format(e.errno, e.strerror))
+        logger.error('Error: {}'.format(e))
 
 
 @shared_task(bind=True)

src/mmw/js/src/core/filters.js

@@ -97,5 +97,9 @@ nunjucks.env.addFilter('toFriendlyBytes', function(bytes) {
 });
 
 nunjucks.env.addFilter('toUnit', function(value, unit) {
+    if (!unit) {
+        return value;
+    }
+
     return coreUnits.get(unit, value).value;
 });

src/mmw/js/src/core/units.js

@@ -88,6 +88,11 @@ var units = {
             factor: 2.83168E-02,
             offset: 0
         },
+        PERCENT: {
+            name: '%',
+            factor: 1,
+            offset: 0
+        },
     },
     METRIC: {
         AREA_XL: {
@@ -170,6 +175,11 @@ var units = {
             factor: 1,
             offset: 0
         },
+        PERCENT: {
+            name: '%',
+            factor: 1,
+            offset: 0
+        },
     },
     get: function(unit, value) {
         var scheme = settings.get('unit_scheme');

src/mmw/js/src/modeling/controls.js

@@ -600,8 +600,8 @@ var PrecipitationView = ControlView.extend({
         // Update values for IE which doesn't trigger onSliderDragged. Will
         // effectively noop on other browsers, since the same values were
         // already set by onSliderDragged.
-        this.ui.slider.attr('value', value);
-        this.ui.displayValue.text(this.getDisplayValue(value));
+        this.ui.slider.attr('value', sliderValue);
+        this.ui.displayValue.text(this.getDisplayValue(sliderValue));
 
         this.addOrReplaceInput(modification);
     },

src/mmw/js/src/modeling/gwlfe/entry/views.js

@@ -339,12 +339,15 @@ var FieldView = Marionette.ItemView.extend({
         var value = this.ui.input.val(),
             unit = this.model.get('unit');
 
-        if (unit) {
+        // Treat empty string as null
+        if (value === '') {
+            value = null;
+        } else if (unit) {
             // Convert user preferred unit into underlying representation
             value /= coreUnits.get(unit, 1).value;
         }
 
-        this.model.set('userValue', value || null);
+        this.model.set('userValue', value);
         this.toggleUserValueState();
     },
 
@@ -357,7 +360,7 @@ var FieldView = Marionette.ItemView.extend({
     toggleUserValueState: function() {
         var userValue = this.model.get('userValue');
 
-        if (userValue) {
+        if (userValue !== null) {
             this.$el.addClass('has-user-value');
         } else {
             this.$el.removeClass('has-user-value');

src/mmw/js/src/modeling/gwlfeModificationConfig.js

@@ -61,6 +61,8 @@ function fromPairs(pairs) {
 }
 
 var displayUnits = fromPairs([
+    [percentAeuToModifyName, 'PERCENT'],
+    [percentAreaToModifyName, 'PERCENT'],
     [areaToModifyName, 'AREA_L_FROM_HA'],
     [lengthToModifyName, 'LENGTH_XL_FROM_KM'],
     [lengthToModifyInAgName, 'LENGTH_XL_FROM_KM'],
@@ -295,6 +297,7 @@ function makeAgBmpConfig(outputName) {
 
 function makeAeuBmpConfig(outputName) {
     return {
+        unit: 'PERCENT',
         dataModelNames: [],
         validateDataModel: makeValidateDataModelFn([]),
         userInputNames: [percentAeuToModifyName],

src/mmw/mmw/settings/production.py

@@ -119,4 +119,4 @@
 GOOGLE_MAPS_API_KEY = 'AIzaSyCXdkywU7rps_i1CeKqWxlBi97vyGeXsqk'
 
 # Stroud account
-GOOGLE_ANALYTICS_ACCOUNT = 'UA-47047573-7'
+GOOGLE_ANALYTICS_ACCOUNT = 'UA-47047573-15'

src/mmw/requirements/base.txt

@@ -24,10 +24,8 @@ https://bitbucket.org/jurko/suds/get/94664ddd46a6.tar.gz#egg=suds-jurko
 django_celery_results==1.0.1
 pandas==0.22.0
 git+git://github.com/emiliom/ulmo@wml_values_md#egg=ulmo
-numpy==1.14.5
 hs_restclient==1.2.10
 six==1.11.0
 fiona==1.7.11
 timeout-decorator==0.4.0
-numba==0.38.1
 redis==2.10.6