diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 12:20:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 12:20:46 +0000 |
| commit | 77ab69cead2d4657d82780463079dc00ed25fc59 (patch) | |
| tree | adfdb7b4160010e49abe5b618e3e53d1a676e5ca | |
| parent | 21bc93af4a78f6e1fb8f78c53e2dc91960bc6893 (diff) | |
| parent | c0fd4389c623d13fc2517b6086fa64ca564bc27f (diff) | |
| download | kolla-77ab69cead2d4657d82780463079dc00ed25fc59.tar.gz kolla-77ab69cead2d4657d82780463079dc00ed25fc59.zip | |
Merge "Move graphviz dependency to test stage"
| -rw-r--r-- | kolla/image/build.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 6c8aa857e..07efe0f02 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -17,7 +17,6 @@ from __future__ import print_function import contextlib import datetime import errno -import graphviz import json import logging import os @@ -859,6 +858,11 @@ class KollaWorker(object): self.images.append(image) def save_dependency(self, to_file): + try: + import graphviz + except ImportError: + LOG.error('"graphviz" is required for save dependency') + raise dot = graphviz.Digraph(comment='Docker Images Dependency') dot.body.extend(['rankdir=LR']) for image in self.images: diff --git a/requirements.txt b/requirements.txt index ee1f1e48c..1a146a219 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,6 @@ gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) six>=1.9.0 # MIT oslo.config>=3.14.0 # Apache-2.0 -graphviz!=0.5.0,>=0.4.0 # MIT License setuptools!=24.0.0,>=16.0 # PSF/ZPL pycrypto>=2.6 # Public Domain netaddr!=0.7.16,>=0.7.13 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 883a8019c..7247553c3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,6 +6,7 @@ bashate>=0.2 # Apache-2.0 beautifulsoup4 # MIT doc8 # Apache-2.0 extras # MIT +graphviz!=0.5.0,>=0.4.0 # MIT License hacking>=0.10.0 oslo.log>=3.11.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 |