improving robustness with new builds

Author: gbarter

meson.build

@@ -21,13 +21,15 @@ endif
 # Here we differentiate from the python used by meson, py3_command, and that python target, py3_target. This is useful
 # when cross compiling like on conda-forge
 py_mod = import('python')
-py3_command = py_mod.find_installation()
 if get_option('python_target') != ''
-    py3_target = py_mod.find_installation(get_option('python_target'))
+  py3 = py_mod.find_installation(get_option('python_target'))
 else
-    py3_target = py3_command
+  py3 = py_mod.find_installation('python')
 endif
-py3_dep = py3_target.dependency()
+py3_dep = py3.dependency()
+
+message(py3.path())
+message(py3.get_install_dir())
 
 subdir('pyframe3dd')
 

meson_options.txt

@@ -2,8 +2,8 @@ option('incdir_numpy', type: 'string', value: '',
     description: 'Include directory for numpy. If left empty Meson will try to find it on its own.')
 
 option('python_target', type: 'string', value: '',
-    description: '''Target python path. This is used in the case that the Python installation that pyFrame3DD is intended
+    description: '''Target python path. This is used in the case that the Python installation that PyOptSparse is intended
     to be built for is different than the Python installation that is used to run Meson. For example, Meson may be installed
-    on the user's system which is run using the system Python installation, but the user may want build pyFrame3DD for
+    on the user's system which is run using the system Python installation, but the user may want build PyOptSparse for
     a Python installation in a virtual environment. Leave as an empty string to build for Python installation running
     Meson.''')

setup.py

@@ -2,12 +2,13 @@
 # only if building in place: ``python setup.py build_ext --inplace``
 import os
 import re
+import platform
 import shutil
 import setuptools
 import subprocess
 
 
-def run_meson_build():
+def run_meson_build(staging_dir):
     prefix = os.path.join(os.getcwd(), staging_dir)
     purelibdir = "."
 
@@ -16,6 +17,12 @@ def run_meson_build():
     if "MESON_ARGS" in os.environ:
         meson_args = os.environ["MESON_ARGS"]
 
+    if platform.system() == "Windows":
+        if not "FC" in os.environ:
+            os.environ["FC"] = "gfortran"
+        if not "CC" in os.environ:
+            os.environ["CC"] = "gcc"
+
     # configure
     meson_path = shutil.which("meson")
     meson_call = (
@@ -24,7 +31,9 @@ def run_meson_build():
     )
     sysargs = meson_call.split(" ")
     sysargs = [arg for arg in sysargs if arg != ""]
+    print(sysargs)
     p1 = subprocess.run(sysargs, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    os.makedirs(staging_dir, exist_ok=True)
     setup_log = os.path.join(staging_dir, "setup.log")
     with open(setup_log, "wb") as f:
         f.write(p1.stdout)
@@ -36,6 +45,8 @@ def run_meson_build():
     # build
     meson_call = f"{meson_path} compile -vC {staging_dir}"
     sysargs = meson_call.split(" ")
+    sysargs = [arg for arg in sysargs if arg != ""]
+    print(sysargs)
     p2 = subprocess.run(sysargs, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     compile_log = os.path.join(staging_dir, "compile.log")
     with open(compile_log, "wb") as f:
@@ -70,9 +81,9 @@ def copy_shared_libraries():
     staging_dir = "meson_build"
 
     # this keeps the meson build system from running more than once
-    if "dist" not in str(os.path.abspath(__file__)) and not os.path.isdir(staging_dir):
+    if "dist" not in str(os.path.abspath(__file__)):
         cwd = os.getcwd()
-        run_meson_build()
+        run_meson_build(staging_dir)
         os.chdir(cwd)
         copy_shared_libraries()
 
@@ -101,8 +112,9 @@ def copy_shared_libraries():
         extras_require={
             "testing": ["pytest"],
         },
-        python_requires=">=3.7",
+        python_requires=">=3.8",
         packages=["pyframe3dd"],
+        package_data={"": ["*.yaml", "*.so", "*.lib", "*.pyd", "*.pdb", "*.dylib", "*.dll"]},
         license='Apache License, Version 2.0',
         zip_safe=False,
     )