diff --git a/meshmode/mesh/io.py b/meshmode/mesh/io.py index f4d7acc88bdfd9e526f4f495f0c061f470ff047c..fd8a82a288ca4536cb9f65d9c3fad617c319a82c 100644 --- a/meshmode/mesh/io.py +++ b/meshmode/mesh/io.py @@ -26,7 +26,7 @@ import six from six.moves import range, zip import numpy as np -from meshpy.gmsh_reader import ( # noqa +from gmsh_interop.reader import ( # noqa GmshMeshReceiverBase, ScriptSource, FileSource, LiteralSource, ScriptWithFilesSource, GmshSimplexElementBase, @@ -220,7 +220,7 @@ def read_gmsh(filename, force_ambient_dim=None): :arg force_ambient_dim: if not None, truncate point coordinates to this many dimensions. """ - from meshpy.gmsh_reader import read_gmsh + from gmsh_interop.reader import read_gmsh recv = GmshMeshReceiver() read_gmsh(recv, filename, force_dimension=force_ambient_dim) @@ -240,8 +240,8 @@ def generate_gmsh(source, dimensions=None, order=None, other_options=[], """ recv = GmshMeshReceiver() - from meshpy.gmsh import GmshRunner - from meshpy.gmsh_reader import parse_gmsh + from gmsh_interop.runner import GmshRunner + from gmsh_interop.reader import parse_gmsh with GmshRunner(source, dimensions, order=order, other_options=other_options, extension=extension, gmsh_executable=gmsh_executable) as runner: diff --git a/requirements.txt b/requirements.txt index 9bb790fe6ad3d67c9e4e9a8851d6fda4515822f2..037c142992375741c15a3061441eb773b180da08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ numpy -git+https://github.com/inducer/meshpy.git +git+https://github.com/inducer/gmsh_interop.git git+https://github.com/inducer/modepy.git git+https://github.com/inducer/pyopencl.git git+https://github.com/inducer/islpy.git diff --git a/setup.py b/setup.py index 8ee75a1812eccaf39d72eb7bf45b9a6cb493471f..f9778b8cd8c32fa63bc61237043d984d880ec331 100644 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ def main(): install_requires=[ "numpy", "modepy", + "gmsh_interop", "six", "pytools>=2013.1", "pytest>=2.3",