Skip to content

Commit

Permalink
squash: post-rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
happz committed Nov 7, 2023
1 parent abf7331 commit 4278e2f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help generate-stories clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext autodocs
.PHONY: help generate-stories generate-autodocs clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext

clean:
rm -rf $(BUILDDIR) stories spec autodocs/*.rst
Expand Down
3 changes: 2 additions & 1 deletion plans/install/docs.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ prepare:
execute:
script: |
set -ex -o pipefail
pip install hatch
make docs 2>&1 | tee output
egrep 'ERROR|WARNING' output && exit 1 || exit 0
grep -E 'ERROR|WARNING' | grep -v 'more than one target found for cross-reference' output && exit 1 || exit 0
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ dependencies = ["tmt[docs]"]
# detached = true

[tool.hatch.envs.docs.scripts]
autodocs = "make -C {root}/docs autodocs"
autodocs = "make -C {root}/docs generate-autodocs"
website = "make -C {root}/docs html"
docs = ["autodocs", "website"]
docs = ["website"]
man = [
"cp {root}/docs/header.txt {root}/man.rst",
"tail -n+8 docs/overview.rst >> {root}/man.rst",
Expand Down
3 changes: 1 addition & 2 deletions tmt/checks/avc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import datetime
from typing import List, Optional, Tuple, Union
from typing import TYPE_CHECKING, List, Optional, Tuple, Union

import tmt.log
import tmt.steps.execute
Expand All @@ -11,7 +11,6 @@
from tmt.utils import CommandOutput, Path, ShellScript, render_run_exception_streams

if TYPE_CHECKING:
from tmt.base import Test
from tmt.steps.execute import ExecutePlugin, ExecuteStepDataT

TEST_POST_AVC_FILENAME = 'tmt-avc-{event}.txt'
Expand Down
2 changes: 1 addition & 1 deletion tmt/steps/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,7 @@ def enqueue(
self,
*,
phase: Union[Action, Plugin[StepDataT]],
guests: List['Guest']) -> None:
guests: List['tmt.steps.provision.Guest']) -> None:
"""
Add a phase to queue.
Expand Down
5 changes: 3 additions & 2 deletions tmt/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6259,11 +6259,12 @@ def retry(
) -> T:
""" Retry functionality to be used elsewhere in the code.
:param func: function to be called with any amount
of arguments of Any type, returning the value of type TypeVar
:param func: function to be called with all unclaimed positional
and keyword arguments.
:param attempts: number of tries to call the function
:param interval: amount of seconds to wait before a new try
:param label: action to retry
:returns: propagates return value of ``func``.
"""
exceptions: List[Exception] = []
for i in range(attempts):
Expand Down

0 comments on commit 4278e2f

Please sign in to comment.