openstack/taskflow
Code Issues Proposed changes

Fix update-states target

Browse Source 
... and regenerate svg files.

Change-Id: I903774597e07a4184213df284207eeac5f329d5e
This commit is contained in:
Takashi Kajinami 2024-04-15 14:43:43 +09:00
parent db020073ec
commit ff45bd3d2d
9 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -57,6 +57,7 @@ ChangeLog
# doc # doc
doc/build/ doc/build/
.diagram-tools/
.idea .idea
env env

6
doc/source/user/img/engine_states.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

6
doc/source/user/img/flow_states.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

6
doc/source/user/img/job_states.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

6
doc/source/user/img/retry_states.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

6
doc/source/user/img/task_states.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

3
tools/state_graph.py
View File

@ -40,6 +40,7 @@ class DummyRuntime(object):
self.completer = mock.MagicMock() self.completer = mock.MagicMock()
self.scheduler = mock.MagicMock() self.scheduler = mock.MagicMock()
self.storage = mock.MagicMock() self.storage = mock.MagicMock()
self.selector = mock.MagicMock()
def make_machine(start_state, transitions, event_name_cb): def make_machine(start_state, transitions, event_name_cb):
@ -129,7 +130,7 @@ def main():
elif options.engines: elif options.engines:
source_type = "Engines" source_type = "Engines"
b = builder.MachineBuilder(DummyRuntime(), mock.MagicMock()) b = builder.MachineBuilder(DummyRuntime(), mock.MagicMock())
source, memory = b.build() source, memory = b.build({})
internal_states.extend(builder.META_STATES) internal_states.extend(builder.META_STATES)
ordering = 'out' ordering = 'out'
elif options.wbe_requests: elif options.wbe_requests:

9
tools/update_states.sh
View File

@ -13,7 +13,7 @@ if [ ! -d "$PWD/.diagram-tools" ]; then
fi fi
script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
img_dir="$script_dir/../doc/source/img" img_dir="$script_dir/../doc/source/user/img"
echo "---- Updating task state diagram ----" echo "---- Updating task state diagram ----"
python $script_dir/state_graph.py -t -f /tmp/states.svg python $script_dir/state_graph.py -t -f /tmp/states.svg
@ -31,9 +31,10 @@ echo "---- Updating retry state diagram ----"
python $script_dir/state_graph.py -r -f /tmp/states.svg python $script_dir/state_graph.py -r -f /tmp/states.svg
$xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/retry_states.svg $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/retry_states.svg
echo "---- Updating wbe request state diagram ----" # NOTE(tkajinam): This is broken since 148963805626f6246554961bd3ff39055de3e317
python $script_dir/state_graph.py -w -f /tmp/states.svg # echo "---- Updating wbe request state diagram ----"
$xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/wbe_request_states.svg # python $script_dir/state_graph.py -w -f /tmp/states.svg
# $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/wbe_request_states.svg
echo "---- Updating job state diagram ----" echo "---- Updating job state diagram ----"
python $script_dir/state_graph.py -j -f /tmp/states.svg python $script_dir/state_graph.py -j -f /tmp/states.svg

3
tox.ini
View File

@ -26,8 +26,9 @@ commands =
[testenv:update-states] [testenv:update-states]
deps = deps =
{[testenv]deps} {[testenv]deps}
pydot3
commands = {toxinidir}/tools/update_states.sh commands = {toxinidir}/tools/update_states.sh
allowlist_externals =
{toxinidir}/tools/update_states.sh
[testenv:pep8] [testenv:pep8]
commands = pre-commit run -a commands = pre-commit run -a