Merge pull request #3090 from WikiWatershed/tt/circumvent-gwlfe-segfa…

…ults Circumvent GWLF-E SegFaults due to NumPy Connects #3089
WikiWatershed · Feb 26, 2019 · 48d5ca0 · 48d5ca0
2 parents b392627 + 8aa7b57
commit 48d5ca0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -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"
diff --git a/deployment/ansible/roles/model-my-watershed.app/tasks/dependencies.yml b/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:

diff --git a/deployment/ansible/roles/model-my-watershed.celery-worker/tasks/dependencies.yml b/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:

diff --git a/src/mmw/requirements/base.txt b/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