|
77 | 77 | 'include_file': 'IpoptConfig.h' |
78 | 78 | }, |
79 | 79 | 'pyoptsparse': { |
80 | | - 'branch': 'v2.8.3', |
| 80 | + 'branch': 'v2.9.2', |
81 | 81 | 'url': 'https://github.com/mdolab/pyoptsparse.git', |
82 | 82 | }, |
83 | 83 | 'hsl': { |
@@ -318,7 +318,7 @@ def try_fallback(pkg:str, e:Exception): |
318 | 318 | print(yellow(f'Installing {pkg} with conda failed, falling back to source build.')) |
319 | 319 | else: |
320 | 320 | print(yellow('Use the --fall-back switch to build source on failed conda installs.')) |
321 | | - raise e |
| 321 | + raise e |
322 | 322 |
|
323 | 323 | def initialize(): |
324 | 324 | """ Perform a collection of setup tasks """ |
@@ -471,7 +471,7 @@ def run_conda_cmd(cmd_args): |
471 | 471 | cmd_list = [opts['conda_cmd']] |
472 | 472 | cmd_list.extend(cmd_args) |
473 | 473 | return run_cmd(cmd_list) |
474 | | - |
| 474 | + |
475 | 475 |
|
476 | 476 | def pip_install(pip_install_args, pkg_desc='packages'): |
477 | 477 | """ |
@@ -774,7 +774,7 @@ def install_with_mumps(): |
774 | 774 | install_metis() |
775 | 775 | install_mumps() |
776 | 776 |
|
777 | | - if opts['include_ipopt'] is True: |
| 777 | + if opts['include_ipopt'] is True: |
778 | 778 | # Get this info in case we need to build IPOPT from source |
779 | 779 | coin_dir = get_coin_inc_dir() |
780 | 780 |
|
@@ -919,7 +919,7 @@ def install_pyoptsparse_from_src(): |
919 | 919 | # It is recommended to use `setuptools < 60.0` for those Python versions. |
920 | 920 | # For more details, see: |
921 | 921 | # https://numpy.org/devdocs/reference/distutils_status_migration.html |
922 | | - pip_install(pip_install_args=['setuptools<65.0'], pkg_desc='setuptools') |
| 922 | + pip_install(pip_install_args=['setuptools<66.0'], pkg_desc='setuptools') |
923 | 923 |
|
924 | 924 | pip_install(pip_install_args=['--no-cache-dir', './'], pkg_desc='pyoptsparse') |
925 | 925 | else: |
@@ -1106,7 +1106,7 @@ def find_required_command(cmd:str, errors:list): |
1106 | 1106 | return False |
1107 | 1107 | elif opts['verbose'] is True: |
1108 | 1108 | print(f"{green('FOUND')}: {cmd} is {cmd_path}") |
1109 | | - |
| 1109 | + |
1110 | 1110 | return True |
1111 | 1111 |
|
1112 | 1112 | def check_sanity(): |
|
0 commit comments