MAINT: Fixes for NumPy deprecation and 3.10

.ci/azure-steps.yml

@@ -2,8 +2,8 @@
 
 steps:
 - script: |
-    python -m pip wheel . -w wheelhouse/
-  displayName: 'Build wheel'
+    python -m pip wheel . -w wheelhouse/ --find-links https://wheels.pyvista.org/ --only-binary="numpy"
+  displayName: 'Build wheel with 3.10 VTK workaround'
 
 - script: |
     python -m pip install $(package_name) --no-index -f wheelhouse/ --upgrade --ignore-installed

.ci/build_wheels.sh

@@ -6,9 +6,6 @@ set -e -x
 # build based on python version from args
 PYTHON_VERSION="$1"
 case $PYTHON_VERSION in
-3.6)
-  PYBIN="/opt/python/cp36-cp36m/bin"
-  ;;
 3.7)
   PYBIN="/opt/python/cp37-cp37m/bin"
   ;;
@@ -18,6 +15,9 @@ case $PYTHON_VERSION in
 3.9)
   PYBIN="/opt/python/cp39-cp39/bin"
   ;;
+3.10)
+  PYBIN="/opt/python/cp310-cp310/bin"
+  ;;
 esac
 
 # build, don't install
@@ -26,4 +26,4 @@ cd io
 "${PYBIN}/python" setup.py bdist_wheel
 auditwheel repair dist/$package_name*.whl
 rm -f dist/*
-mv wheelhouse/*manylinux2010* dist/
+mv wheelhouse/*manylinux2014* dist/

.ci/macos-install-python.sh

@@ -3,18 +3,18 @@
 PYTHON_VERSION="$1"
 
 case $PYTHON_VERSION in
-2.7)
-  FULL_VERSION=2.7.16
-  ;;
-3.6)
-  FULL_VERSION=3.6.8
-  ;;
 3.7)
   FULL_VERSION=3.7.7
   ;;
 3.8)
   FULL_VERSION=3.8.3
   ;;
+3.9)
+  FULL_VERSION=3.9.12
+  ;;
+3.10)
+  FULL_VERSION=3.10.4
+  ;;
 esac
 
 INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg

.github/workflows/testing-and-deployment.yml

@@ -1,4 +1,7 @@
 name: Unit Testing
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
+  cancel-in-progress: true
 
 on:
   push:
@@ -9,11 +12,18 @@ on:
 
 jobs:
   macOS:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
     name: Mac OS Unit Testing
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: ['macos-11']
+        exclude:
+          - python-version: '3.10'
+            os: macos-11
+        include:
+          - python-version: '3.10'
+            os: macos-12
 
     env:
       SHELLOPTS: 'errexit:pipefail'
@@ -26,15 +36,31 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Build package
+      - name: Setup dependencies
+        run: |
+          pip install -r requirements_build.txt --only-binary="numpy" --find-links https://wheels.pyvista.org/
+
+      - name: Build wheel
         run: |
-          pip install -r requirements_build.txt
           python setup.py bdist_wheel
-          pip install dist/*
 
-      - name: Install package
+      - name: Manually install VTK wheel on 3.10 since it does not work locally
+        run: |
+          pip install --upgrade pip
+          curl https://wheels.pyvista.org/vtk-9.1.0.dev0-cp310-cp310-macosx_12_0_x86_64.whl -o vtk-9.1.0.dev0-cp310-cp310-macosx_10_16_x86_64.whl
+          pip install ./vtk-9.1.0.dev0-cp310-cp310-macosx_10_16_x86_64.whl
+        if: ${{ matrix.os == 'macos-12' }}
+
+      - name: Install vtk
+        run: |
+          pip install --find-links https://wheels.pyvista.org/ vtk -vvv
+
+      - name: Install wheel
         run: |
           pip install dist/*
+
+      - name: Check package
+        run: |
           python -c "import pyvista; print(pyvista.Report(gpu=False))"
 
       - name: Install test dependencies

README.rst

@@ -120,7 +120,7 @@ within memory and wish to repair it using MeshFix.
     mesh = meshfix.mesh
 
     # Or, access the resulting arrays directly from the object
-    meshfix.v # numpy np.float array
+    meshfix.v # numpy np.float64 array
     meshfix.f # numpy np.int32 array
 
     # View the repaired mesh (requires vtkInterface)
@@ -148,13 +148,13 @@ algorithm.
 
     # Fill holes
     tin.fill_small_boundaries()
-    print('There are {:d} boundaries'.format(tin.boundaries())
+    print('There are {:d} boundaries'.format(tin.boundaries()))
 
     # Clean (removes self intersections)
     tin.clean(max_iters=10, inner_loops=3)
 
     # Check mesh for holes again
-    print('There are {:d} boundaries'.format(tin.boundaries())
+    print('There are {:d} boundaries'.format(tin.boundaries()))
 
     # Clean again if necessary...
 

azure-pipelines.yml

@@ -15,14 +15,14 @@ jobs:
 - job: Linux
   strategy:
     matrix:
-      Python36:
-        python.version: '3.6'
       Python37:
         python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
+      Python310:
+        python.version: '3.10'
   pool:
     vmImage: 'ubuntu-18.04'
   steps:
@@ -32,11 +32,11 @@ jobs:
       displayName: 'Use Python $(python.version)'
     - script: |
         set -ex
-        docker pull quay.io/pypa/manylinux2010_x86_64
-        docker run -e package_name=$(package_name) --rm -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/.ci/build_wheels.sh $(python.version)
-      displayName: Build wheel using manylinux2010
+        docker pull quay.io/pypa/manylinux2014_x86_64
+        docker run -e package_name=$(package_name) --rm -v `pwd`:/io quay.io/pypa/manylinux2014_x86_64 /io/.ci/build_wheels.sh $(python.version)
+      displayName: Build wheel using manylinux2014
     - script: |
-        pip install dist/*.whl
+        pip install dist/*.whl --find-links https://wheels.pyvista.org/
       displayName: Install wheel
     - script: |
         pip install -r requirements_test.txt
@@ -52,14 +52,14 @@ jobs:
     python.architecture: 'x64'
   strategy:
     matrix:
-      Python36:
-        python.version: '3.6'
       Python37:
         python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
+      Python310:
+        python.version: '3.10'
   steps:
     - template: .ci/azure-setup.yml
     - template: .ci/azure-steps.yml

pymeshfix/cython/_meshfix.pyx

@@ -197,12 +197,12 @@ cdef class PyTMesh:
             raise Exception('Cannot load new arrays once initialized')
 
         if not v.flags['C_CONTIGUOUS']:
-            if v.dtype != np.float:
-                v = np.ascontiguousarray(v, dtype=np.float)
+            if v.dtype not in (float, np.float64):
+                v = np.ascontiguousarray(v, dtype=np.float64)
             else:
                 v = np.ascontiguousarray(v)
-        elif v.dtype != np.float:
-            v = v.astype(np.float)
+        elif v.dtype not in (float, np.float64):
+            v = v.astype(np.float64)
 
         # Ensure inputs are of the right type
         assert f.ndim == 2, 'Face array must be 2D numpy array'

pymeshfix/meshfix.py

@@ -76,7 +76,7 @@ def load_arrays(self, v, f):
         # Check inputs
         if not isinstance(v, np.ndarray):
             try:
-                v = np.asarray(v, np.float)
+                v = np.asarray(v, np.float64)
                 if v.ndim != 2 and v.shape[1] != 3:
                     raise Exception('Invalid vertex format.  Shape ' +
                                     'should be (npoints, 3)')

requirements_build.txt

@@ -1,4 +1,5 @@
 setuptools>=41.0.0
 wheel>=0.33.0
-numpy<1.20.0
+numpy<1.20.0; python_version >= '3.7' and python_version <= '3.9'
+numpy<=1.21.3; python_version >= '3.10'
 cython>=0.29.0

setup.py

@@ -102,11 +102,11 @@ def build_extensions(self):
     classifiers=['Development Status :: 4 - Beta',
                  'Intended Audience :: Science/Research',
                  'License :: OSI Approved :: MIT License',
-                 'Programming Language :: Python :: 3.6',
                  'Programming Language :: Python :: 3.7',
                  'Programming Language :: Python :: 3.8',
                  'Programming Language :: Python :: 3.9',
     ],
+    python_requires='>=3.7',
     url='https://github.com/pyvista/pymeshfix',
 
     # Build cython modules