Bump Python versions and fix numpy/pandas compatibility

.github/workflows/docs.yml

@@ -20,10 +20,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Setup Headless Display
         run: |
-          sudo apt-get install libgl1-mesa-glx
+          sudo apt-get install libgl1 libglx-mesa0
           sudo apt-get install -y xvfb
           Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
           sleep 3

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install Style dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
       - name: Build and Publish to PyPI
         env:
           TWINE_USERNAME: __token__

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)

README.md

@@ -43,7 +43,7 @@ environment (we highly recommend using anaconda) and install *PVGeo* through pip
 pip install PVGeo
 ```
 
-Now *PVGeo* is ready for use in your standard Python environment (>=3.8)
+Now *PVGeo* is ready for use in your standard Python environment (>=3.9)
 with all dependencies installed! Go ahead and test your install:
 
 ```bash

docs/source/overview/getting-started.rst

@@ -4,7 +4,7 @@ Getting Started
 Using PVGeo in a Python Environment
 -----------------------------------
 
-If you'd like to use PVGeo in Python (>=3.8), then simply
+If you'd like to use PVGeo in Python (>=3.9), then simply
 install PVGeo to your active Python environment with ``pip``
 or ``conda``
 

requirements.txt

@@ -1,4 +1,4 @@
-vtk>=8.1.1
+vtk>=8.1.1,<9.4
 pyvista>=0.20.1
 numpy>=1.13
 scipy>=1.1

setup.py

@@ -36,7 +36,7 @@
         + 'https://anaconda.org/anaconda/vtk'
     )
 else:
-    install_requires.append(['vtk>=8.1'])
+    install_requires.append(['vtk>=8.1,<9.4'])
 
 setuptools.setup(
     name="PVGeo",
@@ -49,7 +49,7 @@
     url="https://github.com/OpenGeoVis/PVGeo",
     packages=setuptools.find_packages(),
     install_requires=install_requires,
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     extras_require={
         'pyproj': ['pyproj>=1.9'],
         'omf': ['omf>=0.9.3', 'omfvista>=0.2.0'],