Skip to content

Commit

Permalink
Merge pull request Pyomo#3279 from blnicho/finalize-release-6.7.3
Browse files Browse the repository at this point in the history
Resetting main for development (6.7.4.dev0)
  • Loading branch information
jsiirola committed May 29, 2024
2 parents 8a90b66 + 5c3af84 commit c783037
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pyomo/version/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
# main and needs a hard reference to "suitably new" development.
major = 6
minor = 7
micro = 3
# releaselevel = 'invalid'
releaselevel = 'final'
micro = 4
releaselevel = 'invalid'
# releaselevel = 'final'
serial = 0

if releaselevel == 'final':
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def __ne__(self, other):
'sphinx-toolbox>=2.16.0',
'sphinx-jinja2-compat>=0.1.1',
'enum_tools',
'numpy<2.0.0', # Needed by autodoc for pynumero
'numpy', # Needed by autodoc for pynumero
'scipy', # Needed by autodoc for pynumero
],
'optional': [
Expand All @@ -273,7 +273,7 @@ def __ne__(self, other):
# installed on python 3.8
'networkx<3.2; python_version<"3.9"',
'networkx; python_version>="3.9"',
'numpy<2.0.0',
'numpy',
'openpyxl', # dataportals
#'pathos', # requested for #963, but PR currently closed
'pint', # units
Expand Down

0 comments on commit c783037

Please sign in to comment.