diff options
-rw-r--r-- | miss_htbt_service/mod/trapd_get_cbs_config.py | 3 | ||||
-rw-r--r-- | requirements.txt | 8 | ||||
-rw-r--r-- | setup.py | 9 | ||||
-rw-r--r-- | tests/test_binding.py | 11 |
4 files changed, 12 insertions, 19 deletions
diff --git a/miss_htbt_service/mod/trapd_get_cbs_config.py b/miss_htbt_service/mod/trapd_get_cbs_config.py index 1fa3572..431f93b 100644 --- a/miss_htbt_service/mod/trapd_get_cbs_config.py +++ b/miss_htbt_service/mod/trapd_get_cbs_config.py @@ -4,6 +4,7 @@ # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. +# Copyright 2021 Samsung Electronics. 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. @@ -32,7 +33,7 @@ import sys import string import time import traceback -import collections +import collections.abc from onap_dcae_cbs_docker_client.client import get_config from mod import trapd_settings as tds from mod.trapd_exit import cleanup,cleanup_and_exit diff --git a/requirements.txt b/requirements.txt index 2d6f25c..24b0684 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ requests==2.18.3 onap_dcae_cbs_docker_client==1.0.1 six==1.10.0 -PyYAML==3.12 -httplib2==0.9.2 -HTTPretty==0.8.14 +PyYAML==3.13 +httplib2==0.19.0 +HTTPretty==1.0.5 pyOpenSSL==17.5.0 -Wheel==0.31.0 +Wheel==0.36.2 psycopg2-binary==2.8.5 @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021 Samsung Electronics. 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. @@ -41,11 +42,11 @@ setup( "requests==2.18.3", "onap_dcae_cbs_docker_client==1.0.1", "six==1.10.0", -"PyYAML==3.12", -"httplib2==0.9.2", -"HTTPretty==0.8.14", +"PyYAML==3.13", +"httplib2==0.19.0", +"HTTPretty==1.0.5", "pyOpenSSL==17.5.0", -"Wheel==0.31.0", +"Wheel==0.36.2", "psycopg2-binary==2.8.5" ], author = "Vijay Venkatesh Kumar", diff --git a/tests/test_binding.py b/tests/test_binding.py index 170e8b1..25ab192 100644 --- a/tests/test_binding.py +++ b/tests/test_binding.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. +# Copyright 2021 Samsung Electronics. 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. @@ -25,7 +26,6 @@ import pytest import json import base64 import errno -import imp import time from pip._internal import main as _main from onap_dcae_cbs_docker_client.client import get_config @@ -37,15 +37,6 @@ import unittest MODULE_EXTENSIONS = ('.py', '.pyc', '.pyo') -def package_contents(package_name): - file, pathname, description = imp.find_module(package_name) - if file: - raise ImportError('Not a package: %r', package_name) - # Use a set because some may be both source and compiled. - return set([os.path.splitext(module)[0] - for module in os.listdir(pathname) - if module.endswith(MODULE_EXTENSIONS)]) - ##### # MONKEYPATCHES ##### |