Merge pull request #89 from simpeg/VTK_updates

Vtk updates

Author: lheagy

.bumpversion.cfg

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

.travis.yml

@@ -26,11 +26,8 @@ before_install:
   - conda update --yes conda
 
 install:
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
-      conda install --quiet --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib pillow cython ipython vtk;
-    else
-      conda install --quiet --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib pillow cython ipython;
-    fi
+  - conda install --quiet --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib pillow cython ipython;
+  - conda install --quiet --yes -c menpo vtk
   - pip install -r requirements_dev.txt
   - python setup.py install
   - make build

appveyor.yml

@@ -36,6 +36,7 @@ install:
   - conda info -a
   - "conda create -q -n test-environment python=%PYTHON% numpy scipy matplotlib cython ipython pillow wheel"
   - activate test-environment
+  - conda install --quiet --yes -c menpo vtk
   - pip install -r requirements_dev.txt
   - python setup.py install
 

discretize/MeshIO.py

@@ -250,7 +250,7 @@ def writeVTK(mesh, fileName, models=None, directory=''):
                 vtkDoubleArr.SetName(item[0])
                 vtkObj.GetCellData().AddArray(vtkDoubleArr)
             # Set the active scalar
-            vtkObj.GetCellData().SetActiveScalars(models.keys()[0])
+            vtkObj.GetCellData().SetActiveScalars(list(models.keys())[0])
 
         # Check the extension of the fileName
         ext = os.path.splitext(fname)[1]
@@ -310,7 +310,7 @@ def _toVTRObj(mesh, models=None):
                 vtkDoubleArr.SetName(item[0])
                 vtkObj.GetCellData().AddArray(vtkDoubleArr)
             # Set the active scalar
-            vtkObj.GetCellData().SetActiveScalars(models.keys()[0])
+            vtkObj.GetCellData().SetActiveScalars(list(models.keys())[0])
         return vtkObj
 
     def _readModelUBC_2D(mesh, fileName):

discretize/__init__.py

@@ -18,7 +18,7 @@
         """
     )
 
-__version__   = '0.1.16'
+__version__   = '0.1.17'
 __author__    = 'SimPEG Team'
 __license__   = 'MIT'
 __copyright__ = '2013 - 2017, SimPEG Developers, http://simpeg.xyz'

docs/conf.py

@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.16'
+version = '0.1.17'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.16'
+release = '0.1.17'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -56,7 +56,7 @@ def configuration(parent_package='', top_path=None):
 
 setup(
     name="discretize",
-    version="0.1.16",
+    version="0.1.17",
     install_requires=[
         'numpy>=1.7',
         'scipy>=0.13',