MNT: mkl_fft added as a dependency and replaces default installation …

…of pyfftw
dgursoy · Nov 15, 2017 · d8273ed · d8273ed
1 parent b3671e4
commit d8273ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
   - conda install anaconda-client
 
 install:
-  - conda install python=$TRAVIS_PYTHON_VERSION nose six numpy h5py scipy scikit-image pywavelets mkl-devel python-coveralls dxchange numexpr
+  - conda install python=$TRAVIS_PYTHON_VERSION nose six numpy h5py scipy scikit-image pywavelets mkl-devel mkl_fft python-coveralls dxchange numexpr
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       conda install futures;
     fi

diff --git a/meta.yaml b/meta.yaml
@@ -21,6 +21,7 @@ requirements:
     - h5py
     - scipy
     - six
+    - mkl_fft
     - scikit-image
     - pywavelets
     - dxchange

diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,7 @@ scipy
 scikit-image
 pywavelets
 mkl-devel
+mkl_fft
 dxchange
 numexpr
 futures