Add explicit import of numpy.typing in sources, tests and tutorials, …

…and require numpy >= 1.21
RBniCS · Mar 10, 2022 · 41e45b1 · 41e45b1
1 parent 475f1cb
commit 41e45b1
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 1 deletion.
diff --git a/rbnicsx/_backends/online_tensors.py b/rbnicsx/_backends/online_tensors.py
@@ -13,6 +13,7 @@
 
 import mpi4py.MPI
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 

diff --git a/rbnicsx/_backends/proper_orthogonal_decomposition.py b/rbnicsx/_backends/proper_orthogonal_decomposition.py
@@ -8,6 +8,7 @@
 import typing
 
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 import slepc4py.SLEPc
 

diff --git a/rbnicsx/_backends/tensors_array.py b/rbnicsx/_backends/tensors_array.py
@@ -14,6 +14,7 @@
 
 import mpi4py.MPI
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 from rbnicsx.io import on_rank_zero

diff --git a/rbnicsx/backends/export.py b/rbnicsx/backends/export.py
@@ -11,6 +11,7 @@
 import dolfinx.fem
 import dolfinx.io
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 from rbnicsx._backends.export import (

diff --git a/rbnicsx/backends/mesh_motion.py b/rbnicsx/backends/mesh_motion.py
@@ -13,6 +13,7 @@
 import dolfinx.fem
 import dolfinx.mesh
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 

diff --git a/rbnicsx/backends/proper_orthogonal_decomposition.py b/rbnicsx/backends/proper_orthogonal_decomposition.py
@@ -10,6 +10,7 @@
 
 import dolfinx.fem
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 from rbnicsx._backends.proper_orthogonal_decomposition import (

diff --git a/rbnicsx/backends/tensors_array.py b/rbnicsx/backends/tensors_array.py
@@ -12,6 +12,7 @@
 import dolfinx.fem
 import mpi4py.MPI
 import numpy as np
+import numpy.typing
 
 from rbnicsx._backends.tensors_array import TensorsArray as TensorsArrayBase
 from rbnicsx.backends.export import export_matrices, export_vectors

diff --git a/rbnicsx/online/proper_orthogonal_decomposition.py b/rbnicsx/online/proper_orthogonal_decomposition.py
@@ -9,6 +9,7 @@
 import typing
 
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 
 from rbnicsx._backends.proper_orthogonal_decomposition import (

diff --git a/setup.cfg b/setup.cfg
@@ -39,7 +39,7 @@ install_requires =
     cppimport
     mpi4py
     multipledispatch
-    numpy
+    numpy >= 1.21.0
     petsc4py
     slepc4py
 

diff --git a/tests/unit/backends/test_backends_mesh_motion.py b/tests/unit/backends/test_backends_mesh_motion.py
@@ -12,6 +12,7 @@
 import dolfinx.mesh
 import mpi4py.MPI
 import numpy as np
+import numpy.typing
 import pytest
 
 import rbnicsx.backends

diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -15,6 +15,7 @@
 import _pytest.compat
 import nbvalx.pytest_hooks_unit_tests
 import numpy as np
+import numpy.typing
 import petsc4py.PETSc
 import pytest
 import scipy.sparse

diff --git a/tutorials/01_thermal_block.ipynb b/tutorials/01_thermal_block.ipynb
@@ -33,6 +33,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import plotly.graph_objects as go\n",
     "import slepc4py.SLEPc\n",

diff --git a/tutorials/02_elastic_block.ipynb b/tutorials/02_elastic_block.ipynb
@@ -30,6 +30,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]

diff --git a/tutorials/03_hole.ipynb b/tutorials/03_hole.ipynb
@@ -32,6 +32,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import plotly.graph_objects as go\n",
     "import ufl"

diff --git a/tutorials/04_graetz.ipynb b/tutorials/04_graetz.ipynb
@@ -30,6 +30,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]

diff --git a/tutorials/05_gaussian.ipynb b/tutorials/05_gaussian.ipynb
@@ -30,6 +30,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]

diff --git a/tutorials/07_nonlinear_elliptic.ipynb b/tutorials/07_nonlinear_elliptic.ipynb
@@ -30,6 +30,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]

diff --git a/tutorials/12_stokes.ipynb b/tutorials/12_stokes.ipynb
@@ -31,6 +31,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]

diff --git a/tutorials/17_navier_stokes.ipynb b/tutorials/17_navier_stokes.ipynb
@@ -31,6 +31,7 @@
     "import multiphenicsx.io\n",
     "import multiphenicsx.mesh\n",
     "import numpy as np\n",
+    "import numpy.typing\n",
     "import petsc4py.PETSc\n",
     "import ufl"
    ]