Merge "Fix update-states target"

.gitignore

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

tools/state_graph.py

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

tools/update_states.sh

@@ -13,7 +13,7 @@ if [ ! -d "$PWD/.diagram-tools" ]; then
 fi
 
 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 ----"
 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
 $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/retry_states.svg
 
-echo "---- Updating wbe request state diagram ----"
-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
+# NOTE(tkajinam): This is broken since 148963805626f6246554961bd3ff39055de3e317
+# echo "---- Updating wbe request state diagram ----"
+# 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 ----"
 python $script_dir/state_graph.py -j -f /tmp/states.svg

tox.ini

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