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.

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 Sphinx warnings #2712

Merged
merged 1 commit into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion doc/OnlineDocs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
'sphinx.ext.inheritance_diagram',
'sphinx.ext.autosummary',
'sphinx.ext.doctest',
'sphinx.ext.todo',
'sphinx_copybutton',
#'sphinx.ext.githubpages',
]
Expand Down Expand Up @@ -121,7 +122,7 @@
pygments_style = 'sphinx'

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = False
todo_include_todos = True

# If true, doctest flags (comments looking like # doctest: FLAG, ...) at
# the ends of lines and <BLANKLINE> markers are removed for all code
Expand Down
8 changes: 5 additions & 3 deletions pyomo/contrib/appsi/solvers/highs.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,13 @@ def config(self, val: HighsConfig):
@property
def highs_options(self):
"""
A dictionary mapping solver options to values for those options. These
are solver specific.

Returns
-------
highs_options: dict
A dictionary mapping solver options to values for those options. These
are solver specific.
dict
A dictionary mapping solver options to values for those options
"""
return self._solver_options

Expand Down
7 changes: 4 additions & 3 deletions pyomo/core/base/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -1679,10 +1679,11 @@ def block_data_objects(self,

This is roughly equivalent to

.. code-block:: python

iter(block for block in itertools.chain(
[self], self.component_data_objects(descend_into, ...))
if block.active == active
)
[self], self.component_data_objects(descend_into, ...))
if block.active == active)

Notes
-----
Expand Down
4 changes: 1 addition & 3 deletions pyomo/core/plugins/transform/scaling.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ class ScaleModel(Transformation):
>>> print(value(scaled_model.scaled_obj))
101.0

ToDo
====
- implement an option to change the variables names or not
.. todo:: Implement an option to change the variables names or not

"""

Expand Down