more tidying

This commit is contained in:
Eric Froemling 2021-06-15 10:59:27 -05:00
parent 27811b8487
commit 66e79b6017
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
6 changed files with 10 additions and 10 deletions

View File

@ -1 +1 @@
226926683788933102100058650343380221118
187820143871408304678286045117862733188

View File

@ -2302,7 +2302,7 @@ class TutorialActivity(ba.Activity[Player, Team]):
while self._entries:
entry = self._entries.pop(0)
try:
result = entry.run(self)
result = entry.generate(self)
except Exception:
result = None
ba.print_exception()

View File

@ -1272,7 +1272,7 @@ class Generator:
ba.quit()
def run(projroot: str) -> None:
def generate(projroot: str) -> None:
"""Main entry point."""
toolsdir = os.path.abspath(os.path.join(projroot, 'tools'))
@ -1298,8 +1298,8 @@ def run(projroot: str) -> None:
f' import sys\n'
f' import ba\n'
f' sys.path.append("{toolsdir}")\n'
f' from batools import gendocs\n'
f' gendocs.Generator().run("{outfilename}")\n'
f' import batools.docs\n'
f' batools.docs.Generator().run("{outfilename}")\n'
f' ba.quit()\n'
f'except Exception:\n'
f' import sys\n'

View File

@ -22,7 +22,7 @@ from efrotools import get_files_hash
if TYPE_CHECKING:
from types import ModuleType
from typing import Sequence, Any, Tuple, List
from batools.gendocs import AttributeInfo
from batools.docs import AttributeInfo
def _get_varying_func_info(sig_in: str) -> Tuple[str, str]:
@ -488,7 +488,7 @@ def _formatdoc(docstr: str, indent: int) -> str:
def _writeclasses(module: ModuleType, classnames: Sequence[str]) -> str:
# pylint: disable=too-many-branches
import types
from batools.gendocs import parse_docs_attrs
from batools.docs import parse_docs_attrs
out = ''
for classname in classnames:
cls = getattr(module, classname)

View File

@ -447,8 +447,8 @@ def warm_start_asset_build() -> None:
def gendocs() -> None:
"""Generate docs html."""
import batools.gendocs
batools.gendocs.run(projroot=str(PROJROOT))
import batools.docs
batools.docs.generate(projroot=str(PROJROOT))
def update_docs_md() -> None:
@ -874,7 +874,7 @@ def win_ci_binary_build() -> None:
def genchangelog() -> None:
"""Gen a pretty html changelog."""
from batools.genchangelog import generate
from batools.changelog import generate
generate(projroot=str(PROJROOT))