Add exomerge3.py to the installable Python wheel

packages/seacas/scripts/CMakeLists.txt

@@ -137,6 +137,16 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus)
 		   ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py
 		   @ONLY
 		   )
+	CONFIGURE_FILE(
+		   ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py
+		   ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py
+		   @ONLY
+		   )
+	CONFIGURE_FILE(
+		   ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py
+		   ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py
+		   @ONLY
+		   )
 	 CONFIGURE_FILE(
 		   ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_exodus3.py
 		   ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py
@@ -154,8 +164,8 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus)
 	 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py DESTINATION lib/tests/)
 	 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo DESTINATION lib/tests/)
 	 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/exomerge_unit_test.e DESTINATION lib/tests/)
-	 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py DESTINATION lib)
-	 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py DESTINATION lib)
+	 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py DESTINATION lib)
+	 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py DESTINATION lib)
 
 	 if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")
 	    InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/lib/exodus.py)

packages/seacas/scripts/exodus3.in.py

@@ -115,7 +115,8 @@ def getExodusVersion():
     found.
     """
 
-    return _parse_exodus_version('@EXODUS_VERSION@') 
+    return _parse_exodus_version('@EXODUS_VERSION@')
+
 
 def _parse_exodus_version(version_string):
     if version_string:
@@ -164,7 +165,7 @@ class ex_options(Enum):
 pip_so_path = os.path.join(pip_path, "libexodus.so")
 try:
     EXODUS_LIB = ctypes.cdll.LoadLibrary(pip_so_path)
-except: 
+except Exception:
     EXODUS_LIB = ctypes.cdll.LoadLibrary(EXODUS_SO)
 
 MAX_STR_LENGTH = 32      # match exodus default

packages/seacas/scripts/tests/test_exodus3.py

@@ -25,8 +25,7 @@ def setUp(self):
         input_dir = os.path.dirname(__file__)
         self.tempdir = tempfile.TemporaryDirectory()
         self.temp_exo_path = os.path.join(self.tempdir.name, "temp-test-assembly.exo")
-        with exo.exodus(os.path.join(input_dir, "test-assembly.exo"), mode="r"
-        ) as exofile:
+        with exo.exodus(os.path.join(input_dir, "test-assembly.exo"), mode="r") as exofile:
             self.exofile = exofile
             with self.exofile.copy(self.temp_exo_path, True) as temp_exofile:
                 self.temp_exofile = temp_exofile
@@ -120,9 +119,7 @@ def test_get_block_id_map(self):
     def test_get_assembly(self):
         with exo.exodus(self.temp_exo_path) as temp_exofile:
             assembly_ids = temp_exofile.get_ids("EX_ASSEMBLY")
-            assemblies = [
-                temp_exofile.get_assembly(assembly) for assembly in assembly_ids
-            ]
+            assemblies = [temp_exofile.get_assembly(assembly) for assembly in assembly_ids]
         root = exo.assembly(name="Root", type="EX_ASSEMBLY", id=100)
         root.entity_list = [200, 300, 400]
         self.assertEqual(str(root), str(assemblies[0]))

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import subprocess
@@ -22,13 +22,14 @@
       description='A python wrapper of the exodus library',
       version='1.21.1',
       url='https://github.com/sandialabs/seacas',
-      py_modules=['exodus3'],
+      py_modules=['exodus3', 'exomerge3'],
       package_dir={"":"build/packages/seacas/scripts"},
       cmdclass = {'build_ext': cmake_build_ext},
       ext_modules = [Extension("exodus", [""])]
 )
+
 wheels = os.listdir("dist")
 platform = "linux_x86_64"
-subprocess.run(["python", "-m", "pip", "install", "auditwheel", "patchelf"])
-for wheel in wheels:
-      subprocess.run(["python", "-m", "auditwheel", "repair", "--plat", platform, f"dist/{wheel}"])
+subprocess.run(["python", "-m", "pip", "install", "--user", "auditwheel", "patchelf>=0.14"])
+for wheel in [x for x in wheels if x.endswith(".whl")]:
+      subprocess.run(["python", "-m", "auditwheel", "repair", "--plat", platform, f"dist/{wheel}"])