Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix numpy 1.25 deprecation warnings #372

Merged
merged 4 commits into from
Dec 18, 2023
Merged

Fix numpy 1.25 deprecation warnings #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8e1113
fix deprecation warnings
eirikurj Dec 12, 2023
cb19f2b
adding disallow_deprecations to tests
eirikurj Dec 12, 2023
ab4df5d
address comments
eirikurj Dec 13, 2023
436319e
Merge branch 'main' into fixNumpyDeprecationWarnings
eirikurj Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/test_real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ cd tests
# we have to copy over the coveragerc file to make sure it's in the
# same directory where codecov is run
cp ../.coveragerc .
testflo --pre_announce -v --coverage --coverpkg pyoptsparse $EXTRA_FLAGS
testflo --pre_announce --disallow_deprecations -v --coverage --coverpkg pyoptsparse $EXTRA_FLAGS
9 changes: 6 additions & 3 deletions pyoptsparse/pyOpt_solution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Standard Python modules
import copy

# External modules
import numpy as np

Check warning on line 5 in pyoptsparse/pyOpt_solution.py

View check run for this annotation

Codecov / codecov/patch

pyoptsparse/pyOpt_solution.py#L5 

Added line #L5 was not covered by tests

# Local modules
from .pyOpt_optimization import Optimization

Expand Down Expand Up @@ -49,9 +52,9 @@
i += 1

# Now set the f-values
if isinstance(fStar, float) or len(fStar) == 1:
self.objectives[list(self.objectives.keys())[0]].value = float(fStar)
fStar = float(fStar)
if isinstance(fStar, np.ndarray) and len(fStar) == 1:
self.objectives[list(self.objectives.keys())[0]].value = fStar.item()
fStar = fStar.item()
else:
for f_name, f in self.objectives.items():
f.value = fStar[f_name]
Expand Down
Loading