From 0264007befe126b2d3bfc6c6ddb19cfabad7226b Mon Sep 17 00:00:00 2001 From: Michael Bynum Date: Fri, 19 Apr 2019 08:39:52 -0600 Subject: [PATCH 1/2] adding .so extensions for darwin --- pyomo/common/fileutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/common/fileutils.py b/pyomo/common/fileutils.py index 7c3bc5cc7f0..849d28f42ba 100644 --- a/pyomo/common/fileutils.py +++ b/pyomo/common/fileutils.py @@ -243,7 +243,7 @@ def find_dir(dirname, cwd=True, mode=os.R_OK, pathlist=[], 'linux': ('.so', '.so.*'), 'windows': ('.dll',), 'cygwin': ('.dll', '.so', '.so.*'), - 'darwin': ('.dylib',), + 'darwin': ('.dylib', '.so', '.so.*'), } def _system(): From 8ace99351db1ac0a496d9e0786d9756f1618d6a6 Mon Sep 17 00:00:00 2001 From: Michael Bynum Date: Fri, 19 Apr 2019 08:42:34 -0600 Subject: [PATCH 2/2] adding .pyd extension for windows --- pyomo/common/fileutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/common/fileutils.py b/pyomo/common/fileutils.py index 849d28f42ba..b2fd645d29e 100644 --- a/pyomo/common/fileutils.py +++ b/pyomo/common/fileutils.py @@ -241,7 +241,7 @@ def find_dir(dirname, cwd=True, mode=os.R_OK, pathlist=[], _libExt = { 'linux': ('.so', '.so.*'), - 'windows': ('.dll',), + 'windows': ('.dll', '.pyd'), 'cygwin': ('.dll', '.so', '.so.*'), 'darwin': ('.dylib', '.so', '.so.*'), }