From 0b19083f6e31e7ad136227ac9d6bf8ce66338bf7 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 7 Dec 2017 13:21:25 -0600
Subject: [PATCH] Switch gmsh reading from meshpy to gmsh_interop

---
 meshmode/mesh/io.py | 8 ++++----
 requirements.txt    | 2 +-
 setup.py            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meshmode/mesh/io.py b/meshmode/mesh/io.py
index f4d7acc8..fd8a82a2 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 9bb790fe..037c1429 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 8ee75a18..f9778b8c 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",
-- 
GitLab