From 3129229fc850ad8039b2241f389cd5f6fe28f840 Mon Sep 17 00:00:00 2001
From: Alexander Mazuruk <a.mazuruk@samsung.com>
Date: Fri, 26 Mar 2021 16:18:03 +0100
Subject: Dependencies update: Wheel, PyYAML, httplib2, HTTPretty

Changelogs of updated pkgs:
https://wheel.readthedocs.io/en/stable/news.html
https://github.com/yaml/pyyaml/blob/master/CHANGES
https://github.com/httplib2/httplib2/blob/master/CHANGELOG
https://httpretty.readthedocs.io/en/latest/changelog.html

Additionally resolved some warnings reported by tox:
- remove unused func from tests that used deprecated python lib.
- change collections import to collections.abc

Issue-ID: DCAEGEN2-2720
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: I1dadbe9e6e410bdec1a06ea7c69e49576551218b
---
 miss_htbt_service/mod/trapd_get_cbs_config.py |  3 ++-
 requirements.txt                              |  8 ++++----
 setup.py                                      |  9 +++++----
 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
diff --git a/setup.py b/setup.py
index f5abfd2..67d7308 100644
--- a/setup.py
+++ b/setup.py
@@ -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
 #####
-- 
cgit 1.2.3-korg