Update numpy and pandas compatibility

Author: banesullivan

PVGeo/__init__.py

@@ -40,7 +40,6 @@ def tryVTK():
     from .interface import *
 # VTK-dependent imports complete
 
-from . import version
 from .cmaps import *
 
 # Project MetaData
@@ -49,7 +48,3 @@ def tryVTK():
 __copyright__ = '2018, Bane Sullivan'
 __version__ = '3.0.1'
 __displayname__ = 'PVGeo'
-
-
-# Now check that NumPy is at a satisfactory version
-version.check_numpy()

PVGeo/filters/voxelize.py

@@ -17,7 +17,6 @@
 
 from .. import _helpers, interface
 from ..base import FilterBase
-from ..version import check_numpy
 from .xyz import RotationTool
 
 ###############################################################################
@@ -102,8 +101,6 @@ def estimate_uniform_spacing(self, x, y, z):
 
     def points_to_grid(self, xo, yo, zo, dx, dy, dz, grid=None):
         """Convert XYZ points to a ``vtkUnstructuredGrid``."""
-        if not check_numpy(alert='warn'):
-            return grid
         if grid is None:
             grid = vtk.vtkUnstructuredGrid()
 

PVGeo/readers/delimited.py

@@ -124,7 +124,7 @@ def _file_contents_to_data_frame(self, contents):
                 df = pd.read_csv(
                     StringIO("\n".join(content)),
                     names=self.get_titles(),
-                    delim_whitespace=self.get_split_on_white_space(),
+                    sep=r'\s+',
                 )
             else:
                 df = pd.read_csv(

PVGeo/ubc/tensor.py

@@ -200,7 +200,7 @@ def ubc_model_2d(FileName):
         )
         names = ['col%d' % i for i in range(dim[0])]
         df = pd.read_csv(
-            FileName, names=names, delim_whitespace=True, skiprows=1, comment='!'
+            FileName, names=names, sep=r'\s+', skiprows=1, comment='!'
         )
         data = df.values
         if np.shape(data)[0] != dim[1] and np.shape(data)[1] != dim[0]:
@@ -484,7 +484,7 @@ def _read_up_front(self):
         self.__indices = pd.read_csv(
             StringIO("\n".join(content[1::])),
             names=['i', 'j', 'k'],
-            delim_whitespace=True,
+            sep=r'\s+',
         )
         # NOTE: K indices are inverted
         self.need_to_read(flag=False)