Merge pull request #369 from tomopy/fix-build

.appveyor.yml

@@ -70,7 +70,7 @@ install:
   - conda update conda
   - "conda install
     python=%PYTHON_VERSION% mkl-devel mkl mingw make setuptools
-    nose dxchange h5py mkl_fft numexpr numpy pywavelets
+    nose dxchange mkl_fft numexpr numpy
     scipy scikit-image six"
   # Check that we have the expected version and architecture for Python
   - conda info -a

.travis.yml

@@ -22,8 +22,8 @@ before_install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update conda
 install:
-  - "conda install python=$TRAVIS_PYTHON_VERSION nose six numpy h5py scipy
-    scikit-image pywavelets mkl-devel mkl_fft python-coveralls dxchange
+  - "conda install python=$TRAVIS_PYTHON_VERSION nose six numpy scipy
+    scikit-image mkl-devel mkl_fft python-coveralls dxchange
     numexpr coverage timemory pyctest"
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       conda install futures;

INSTALL

@@ -1,12 +1,3 @@
-
-To build the libtomopy shared library, use
-
-    python build.py
-
-This will compile a shared library:
-libtomopy.so, libtomopy.dylib, or libtomopy.dll (Linux, MacOS, Windows)
-and install it to ./lib
-
 For Windows, both MinGW-64 and `make` need to be installed and placed in the
 PATH, so that the appropriate 'gcc.exe' (that is, one that supports C99) and
 'make.exe' can be found. For Anaconda Python on Windows, adding the conda

VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

doc/source/install.rst

@@ -7,13 +7,20 @@ This section covers the basics of how to download and install TomoPy.
 .. contents:: Contents:
    :local:
 
+
 Supported Environments
-======================
+----------------------
 
 TomoPy is tested, built, and distributed for python 2.7 3.5 3.6 on Linux/macOS
 and python 3.5 3.6 on Windows 10.
 
-Installing from Conda (Recommended)
+Common issues
+-------------
+
+When using pyFFTW instead of MKL-FFT, it is best to import TomoPy before importing NumPy.
+See `this thread <https://github.com/tomopy/tomopy/issues/178>`_ for details.
+
+OPTION 1: Installing from Conda (Recommended)
 ===================================
 
 If you only want to run TomoPy, not develop it, then you should install through
@@ -38,7 +45,7 @@ frequently. To update the installation run::
 For some more information about using Conda, please refer to the
 `docs <http://conda.pydata.org/docs>`__.
 
-Installing from source with Conda
+OPTION 2: Installing from source with Conda
 =================================
 
 Sometimes an adventurous user may want to get the source code, which is
@@ -66,18 +73,6 @@ installed using Conda by running::
     $ conda install --file requirements.txt
 
 After navigating to inside the `tomopy` directory, you can install TomoPy by
-building/compiling the shared libraries and running the install script::
+running the install script::
 
-    $ python build.py
     $ pip install .
-
-Common issues
--------------
-
-No issues with the current build system have been reported.
-
-Importing TomoPy
-================
-
-When importing, it is best to import TomoPy before importing numpy.
-See `this thread <https://github.com/tomopy/tomopy/issues/178>`_ for details.

meta.yaml

@@ -1,24 +1,24 @@
 package:
   name: tomopy
-  version: '1.2.1'
+  version: '1.3.0'
 
 source:
   # git_url: https://github.com/tomopy/tomopy.git
   path: .
 
 build:
-  number: 1
+  number: 0
   script:
     - "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv"
 
 requirements:
   build:
     - {{ compiler('c') }}  # [not win]
-    - mkl-devel  # [not win]
-  host:
     - Make  # [win]
     - MinGW  # [win]
     - mkl-devel
+    - python={{ python }}  # [win]
+  host:
     - pip
     - python={{ python }}
     - setuptools
@@ -29,7 +29,6 @@ requirements:
     - mkl
     - mkl_fft
     - python={{ python }}
-    - pywavelets
     - numpy
     - scikit-image
     - scipy

requirements.txt

@@ -3,7 +3,6 @@ h5py
 scipy
 six
 scikit-image
-pywavelets
 mkl
 mkl_fft
 dxchange

tomopy/__init__.py

@@ -49,7 +49,7 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-__version__ = '1.2.1'
+__version__ = '1.3.0'
 
 from ._fft_loader import fft_impl
 from tomopy.misc.corr import *