Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/smartin71/pyomo into parmes…
Browse files Browse the repository at this point in the history
…t-redesign
  • Loading branch information
kaklise committed Apr 30, 2024
2 parents 9c5f8df + bf865f4 commit 354f0b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pyomo/contrib/parmest/parmest.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
from pyomo.common.deprecation import deprecated
from pyomo.common.deprecation import deprecation_warning

DEPRECATION_VERSION = '6.7.0'
DEPRECATION_VERSION = '6.7.2.dev0'

parmest_available = numpy_available & pandas_available & scipy_available

Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/parmest/scenariocreator.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from pyomo.common.deprecation import deprecated
from pyomo.common.deprecation import deprecation_warning

DEPRECATION_VERSION = '6.7.0'
DEPRECATION_VERSION = '6.7.2.dev0'

import logging

Expand Down

0 comments on commit 354f0b8

Please sign in to comment.