Merge branch 'master' of github.com:dctrud/clair-singularity

clair_singularity/clair.py

@@ -2,7 +2,6 @@ from __future__ import print_function
 import requests
 import sys
 
-from util import pretty_json
 
 
 class ClairException(Exception):

setup.py

@@ -3,7 +3,7 @@ Scan Singularity container images using CoreOS Clair.
 """
 from setuptools import find_packages, setup
 
-dependencies = ['click', 'six']
+dependencies = ['click', 'six', 'requests']
 
 setup(
     name='clair_singularity',

tests/test_image.py

@@ -7,7 +7,7 @@ import pytest
 import requests
 
 from clair_singularity.image import image_to_tgz, check_image, http_server
-from clair_singularity.util import sha256, err_and_exit
+from clair_singularity.util import sha256, err_and_exit, wait_net_service
 
 
 @pytest.fixture