Commit fc052514 authored by David Trudgian's avatar David Trudgian
Browse files

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

parents 440e0834 6fec904d
...@@ -2,7 +2,6 @@ from __future__ import print_function ...@@ -2,7 +2,6 @@ from __future__ import print_function
import requests import requests
import sys import sys
from util import pretty_json
class ClairException(Exception): class ClairException(Exception):
......
...@@ -3,7 +3,7 @@ Scan Singularity container images using CoreOS Clair. ...@@ -3,7 +3,7 @@ Scan Singularity container images using CoreOS Clair.
""" """
from setuptools import find_packages, setup from setuptools import find_packages, setup
dependencies = ['click', 'six'] dependencies = ['click', 'six', 'requests']
setup( setup(
name='clair_singularity', name='clair_singularity',
......
...@@ -7,7 +7,7 @@ import pytest ...@@ -7,7 +7,7 @@ import pytest
import requests import requests
from clair_singularity.image import image_to_tgz, check_image, http_server 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 @pytest.fixture
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment