Skip to content

Commit 9070b60

Browse files
authored
Merge pull request #47 from swryan/np124
Update default pyoptsparse branch to v2.9.2
2 parents a0f46cb + 9deb72f commit 9070b60

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you have a previous installation of pyOptSparse and its dependencies and are
1616
To install:
1717
1. Activate your virtual environment
1818
2. Git clone the repository
19-
3. Run `python -m pip install ./build_pyoptsparse`.
19+
3. Run `python -m pip install ./build_pyoptsparse`.
2020
If ParOpt support is desired, run `python -m pip install './build_pyoptsparse[paropt]'`
2121

2222
## Usage
@@ -38,7 +38,7 @@ options:
3838
-h, --help show this help message and exit
3939
-a, --paropt Add ParOpt support. Default: no ParOpt
4040
-b BRANCH, --branch BRANCH
41-
pyOptSparse git branch. Default: v2.8.3
41+
pyOptSparse git branch. Default: v2.9.2
4242
-c CONDA_CMD, --conda-cmd CONDA_CMD
4343
Command to install packages with if conda is used. Default: conda
4444
-d, --no-delete Do not erase the build directories after completion.

build_pyoptsparse.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
'include_file': 'IpoptConfig.h'
7878
},
7979
'pyoptsparse': {
80-
'branch': 'v2.8.3',
80+
'branch': 'v2.9.2',
8181
'url': 'https://github.com/mdolab/pyoptsparse.git',
8282
},
8383
'hsl': {
@@ -318,7 +318,7 @@ def try_fallback(pkg:str, e:Exception):
318318
print(yellow(f'Installing {pkg} with conda failed, falling back to source build.'))
319319
else:
320320
print(yellow('Use the --fall-back switch to build source on failed conda installs.'))
321-
raise e
321+
raise e
322322

323323
def initialize():
324324
""" Perform a collection of setup tasks """
@@ -471,7 +471,7 @@ def run_conda_cmd(cmd_args):
471471
cmd_list = [opts['conda_cmd']]
472472
cmd_list.extend(cmd_args)
473473
return run_cmd(cmd_list)
474-
474+
475475

476476
def pip_install(pip_install_args, pkg_desc='packages'):
477477
"""
@@ -774,7 +774,7 @@ def install_with_mumps():
774774
install_metis()
775775
install_mumps()
776776

777-
if opts['include_ipopt'] is True:
777+
if opts['include_ipopt'] is True:
778778
# Get this info in case we need to build IPOPT from source
779779
coin_dir = get_coin_inc_dir()
780780

@@ -919,7 +919,7 @@ def install_pyoptsparse_from_src():
919919
# It is recommended to use `setuptools < 60.0` for those Python versions.
920920
# For more details, see:
921921
# 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')
923923

924924
pip_install(pip_install_args=['--no-cache-dir', './'], pkg_desc='pyoptsparse')
925925
else:
@@ -1106,7 +1106,7 @@ def find_required_command(cmd:str, errors:list):
11061106
return False
11071107
elif opts['verbose'] is True:
11081108
print(f"{green('FOUND')}: {cmd} is {cmd_path}")
1109-
1109+
11101110
return True
11111111

11121112
def check_sanity():

0 commit comments

Comments
 (0)