Skip to content

Commit 2954417

Browse files
authored
Merge pull request #3167 from jsiirola/auto-module-import-callbacks
Automate TPL callback registrations
2 parents 0b94b39 + 46bfee3 commit 2954417

File tree

14 files changed

+365
-124
lines changed

14 files changed

+365
-124
lines changed

doc/OnlineDocs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def check_output(self, want, got, optionflags):
271271
yaml_available, networkx_available, matplotlib_available,
272272
pympler_available, dill_available,
273273
)
274-
pint_available = attempt_import('pint', defer_check=False)[1]
274+
pint_available = attempt_import('pint', defer_import=False)[1]
275275
from pyomo.contrib.parmest.parmest import parmest_available
276276
277277
import pyomo.environ as _pe # (trigger all plugin registrations)

doc/OnlineDocs/contributed_packages/pyros.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ could have been equivalently written as:
689689
... },
690690
... )
691691
==============================================================================
692-
PyROS: The Pyomo Robust Optimization Solver.
692+
PyROS: The Pyomo Robust Optimization Solver...
693693
...
694694
------------------------------------------------------------------------------
695695
Robust optimal solution identified.

0 commit comments

Comments
 (0)