From b1ce6f9ba305155d93c04a75cef76f1cfd41ab52 Mon Sep 17 00:00:00 2001 From: dparalen Date: Fri, 28 Apr 2017 12:31:27 +0200 Subject: [PATCH] Bump pydot2 to pydot3 pydot2 is incompatible with python3[1]. Bumping the pydot release (through the test-requirements.txt) rather than pinning basepython to fix this. Also updating the states.svg with the tox -egenstates result of running pydot3 [1] https://github.com/erocarrera/pydot/issues/107 Change-Id: I9aa0e701af3915b39e1a5681c2105a6afb687dd2 Depends-On: I82e3651eefd3186c9e131b0db29a328967fb3161 --- doc/source/images/states.svg | 318 +++++++++++++++++------------------ test-requirements.txt | 1 + tox.ini | 1 - 3 files changed, 160 insertions(+), 160 deletions(-) diff --git a/doc/source/images/states.svg b/doc/source/images/states.svg index 795152fd4..b2a70a23a 100644 --- a/doc/source/images/states.svg +++ b/doc/source/images/states.svg @@ -4,227 +4,227 @@ - - + + Ironic Inspector states - + enrolling - -enrolling - - - -processing - -processing - - - -enrolling->processing - - -process + +enrolling - + error - -error + +error - + enrolling->error - - -error + + +error enrolling->error - - -timeout + + +timeout - - -processing->error - - -error + + +processing + +processing - - -processing->error - - -timeout + + +enrolling->processing + + +process - - -finished - -finished - - - -processing->finished - - -finish + + +error->error + + +abort error->error - - -abort - - - -error->error - - -error - - - -starting - -starting - - - -error->starting - - -start + + +error - + reapplying - -reapplying + +reapplying - + error->reapplying - - -reapply + + +reapply - - -starting->error - - -error + + +starting + +starting - - -starting->error - - -timeout + + +error->starting + + +start - - -starting->starting - - -start + + +processing->error + + +error - - -waiting - -waiting + + +processing->error + + +timeout - - -starting->waiting - - -wait + + +finished + +finished + + + +processing->finished + + +finish reapplying->error - - -error + + +error - + reapplying->error - - -timeout + + +timeout - + reapplying->reapplying - - -reapply + + +reapply - + reapplying->finished - - -finish + + +finish - - -finished->starting - - -start + + +starting->error + + +error + + + +starting->error + + +timeout + + + +starting->starting + + +start + + + +waiting + +waiting + + + +starting->waiting + + +wait - + finished->reapplying - - -reapply + + +reapply + + + +finished->starting + + +start - + finished->finished - - -finish - - - -waiting->processing - - -process + + +finish - + waiting->error - - -abort + + +abort waiting->error - - -timeout + + +timeout + + + +waiting->processing + + +process - + waiting->starting - - -start + + +start diff --git a/test-requirements.txt b/test-requirements.txt index 04e8c0266..8b9e8044f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,4 +13,5 @@ fixtures>=3.0.0 # Apache-2.0/BSD testresources>=0.2.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 +pydot3>=1.0.8 # MIT License diff --git a/tox.ini b/tox.ini index 3459973a9..6d79ffbf7 100644 --- a/tox.ini +++ b/tox.ini @@ -48,7 +48,6 @@ commands = oslo-config-generator --config-file config-generator.conf [testenv:genstates] deps = {[testenv]deps} - pydot2 commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/states.svg --format svg [flake8]