Merge pull request #29 from simpeg/dev

Dev

Author: lheagy

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 0.1.1b1
+current_version = 0.1.2
 files = setup.py discretize/__init__.py docs/conf.py
 

.coveragerc

@@ -7,3 +7,4 @@ omit =
     */site-packages/ordereddict.py
     */site-packages/nose/*
     */unittest2/*
+    */setup.py

README.rst

@@ -1,14 +1,11 @@
-.. image:: https://raw.github.com/simpeg/simpeg/master/docs/images/simpeg-logo.png
-    :alt: discretize Logo
-
 discretize
 ==========
 
 .. image:: https://img.shields.io/pypi/v/discretize.svg
     :target: https://pypi.python.org/pypi/discretize
     :alt: Latest PyPI version
 
-.. image:: https://img.shields.io/badge/license-MIT-blue.svg
+.. image:: https://img.shields.io/github/license/simpeg/simpeg.svg
     :target: https://github.com/simpeg/discretize/blob/master/LICENSE
     :alt: MIT license
 

appveyor.yml

@@ -20,7 +20,20 @@ install:
   - "conda create -q -n test-environment python=%PYTHON% numpy scipy matplotlib cython ipython pillow"
   - activate test-environment
   - pip install -r requirements_dev.txt
-  - python setup.py install build_ext -i cython
+  - python setup.py install
 
 test_script:
-  - nosetests tests\base -v -s
+  - cd tests
+  - nosetests base tree -v -s
+  - cd ..
+
+after_test:
+  # This step builds your wheels.
+  # Again, you only need build.cmd if you're building C extensions for
+  # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct
+  # interpreter
+  - python setup.py bdist_wheel
+
+artifacts:
+  # bdist_wheel puts your built wheel in the dist directory
+  - path: dist\*

discretize/TreeMesh.py

@@ -83,13 +83,7 @@
 import scipy.sparse as sp
 
 from discretize import utils
-
-try:
-    from . import TreeUtils
-    _IMPORT_TREEUTILS = True
-except Exception:
-    _IMPORT_TREEUTILS = False
-
+from . import TreeUtils
 
 from .InnerProducts import InnerProducts
 from .TensorMesh import TensorMesh, BaseTensorMesh
@@ -105,13 +99,8 @@ class TreeMesh(BaseTensorMesh, InnerProducts, TreeMeshIO):
     _meshType = 'TREE'
 
     def __init__(self, h, x0=None, levels=None):
-        if not _IMPORT_TREEUTILS:
-            raise Exception(
-                'Could not import the Cython code to run the '
-                'TreeMesh Try:.\n\npython setup.py build_ext --inplace'
-            )
         assert type(h) is list, 'h must be a list'
-        assert len(h) in [2, 3], "There is only support for TreeMesh in 2D or 3D."
+        assert len(h) in [2, 3], "TreeMesh is only in 2D or 3D."
 
         BaseTensorMesh.__init__(self, h, x0)
 
@@ -370,7 +359,8 @@ def ntEx(self):
 
     @property
     def ntEy(self):
-        if self.dim == 2:return self.ntFx
+        if self.dim == 2:
+            return self.ntFx
         self.number()
         return len(self._edgesY)
 
@@ -389,13 +379,13 @@ def _sortedCells(self):
 
     @property
     def permuteCC(self):
-        #TODO: cache these?
+        # TODO: cache these?
         P  = SortGrid(self.gridCC)
         return sp.identity(self.nC).tocsr()[P,:]
 
     @property
     def permuteF(self):
-        #TODO: cache these?
+        # TODO: cache these?
         P = SortGrid(self.gridFx)
         P += SortGrid(self.gridFy, offset=self.nFx)
         if self.dim == 3:
@@ -404,16 +394,16 @@ def permuteF(self):
 
     @property
     def permuteE(self):
-        #TODO: cache these?
+        # TODO: cache these?
         if self.dim == 2:
             P = SortGrid(self.gridFy)
             P += SortGrid(self.gridFx, offset=self.nEx)
-            return sp.identity(self.nE).tocsr()[P,:]
+            return sp.identity(self.nE).tocsr()[P, :]
         if self.dim == 3:
             P = SortGrid(self.gridEx)
             P += SortGrid(self.gridEy, offset=self.nEx)
             P += SortGrid(self.gridEz, offset=self.nEx+self.nEy)
-            return sp.identity(self.nE).tocsr()[P,:]
+            return sp.identity(self.nE).tocsr()[P, :]
 
     def _index(self, pointer):
         assert len(pointer) is self.dim+1