diff options
Diffstat (limited to 'dcae-cli')
| -rw-r--r-- | dcae-cli/ChangeLog.md | 6 | ||||
| -rw-r--r-- | dcae-cli/dcae_cli/_version.py | 2 | ||||
| -rw-r--r-- | dcae-cli/dcae_cli/util/docker_util.py | 15 | ||||
| -rw-r--r-- | dcae-cli/requirements.txt | 30 | ||||
| -rw-r--r-- | dcae-cli/setup.py | 5 |
5 files changed, 31 insertions, 27 deletions
diff --git a/dcae-cli/ChangeLog.md b/dcae-cli/ChangeLog.md index e3aaac4..aa845bd 100644 --- a/dcae-cli/ChangeLog.md +++ b/dcae-cli/ChangeLog.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.10.2] + +* Fix dependency conflict with python-consul +* Fix psycopg2 warning by requiring psycopg2-binary +* Use Docker client from env when checking images + ## [2.10.1] * Fix DCAEGEN2-402 diff --git a/dcae-cli/dcae_cli/_version.py b/dcae-cli/dcae_cli/_version.py index be3a135..ac49ad3 100644 --- a/dcae-cli/dcae_cli/_version.py +++ b/dcae-cli/dcae_cli/_version.py @@ -19,4 +19,4 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -*- coding: utf-8 -*- -__version__ = "2.10.1" +__version__ = "2.10.2" diff --git a/dcae-cli/dcae_cli/util/docker_util.py b/dcae-cli/dcae_cli/util/docker_util.py index a0499d6..7ae933f 100644 --- a/dcae-cli/dcae_cli/util/docker_util.py +++ b/dcae-cli/dcae_cli/util/docker_util.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -83,21 +83,10 @@ def get_docker_client(profile, logins=[]): except: raise DockerError('Could not connect to the Docker daemon. Is it running?') -def _get_docker_client(client_funcs=(docker.Client, docker.from_env)): - '''Returns a docker client object''' - for func in client_funcs: - try: - client = func(version='auto') - client.ping() - return client - except: - continue - raise DockerError('Could not connect to the Docker daemon. Is it running?') - def image_exists(image): '''Returns True if the image exists locally''' - client = _get_docker_client() + client = docker.from_env(version="auto") return True if client.images(image) else False diff --git a/dcae-cli/requirements.txt b/dcae-cli/requirements.txt index 03244e7..4ca45e2 100644 --- a/dcae-cli/requirements.txt +++ b/dcae-cli/requirements.txt @@ -1,13 +1,21 @@ -# TODO: May need to add the following line -python-consul==0.6.1 -six==1.10.0 -SQLAlchemy==1.1.4 -SQLAlchemy-Utils==0.32.11 -click==6.6 -jsonschema==2.5.1 +certifi==2018.4.16 +chardet==3.0.4 +click==6.7 docker-py==1.10.6 -terminaltables==3.1.0 +docker-pycreds==0.3.0 +genson==1.0.1 +idna==2.7 +jsonschema==2.6.0 +-e git+ssh://researchmike@gerrit.onap.org:29418/dcaegen2/platform/cli@4f039724360fbf13a8295c2074180fa5c9c0320b#egg=onap_dcae_cli&subdirectory=dcae-cli onap-dcae-discovery-client==2.1.0 -onap-dcae-dockering==1.3.0 -psycopg2==2.7.1 -genson==0.2.2 +onap-dcae-dockering==1.4.0 +psycopg2==2.7.5 +psycopg2-binary==2.7.5 +python-consul==0.7.2 +requests==2.19.1 +six==1.11.0 +SQLAlchemy==1.2.10 +SQLAlchemy-Utils==0.33.3 +terminaltables==3.1.0 +urllib3==1.23 +websocket-client==0.48.0 diff --git a/dcae-cli/setup.py b/dcae-cli/setup.py index 9cfdd3f..d5f5dcc 100644 --- a/dcae-cli/setup.py +++ b/dcae-cli/setup.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ setup( dcae_cli=dcae_cli.cli:cli """, setup_requires=['pytest-runner'], - install_requires=['python-consul', + install_requires=['python-consul<1.0.0', 'six', 'sqlalchemy', 'SQLAlchemy-Utils', @@ -50,6 +50,7 @@ setup( 'jsonschema', 'terminaltables', 'psycopg2', + 'psycopg2-binary', 'genson', 'onap-dcae-discovery-client>=2.0.0', 'onap-dcae-dockering>=1.0.0,<2.0.0' |