Merge branch 'main' into fix-add-labels-to-examples

Author: padamstx

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.17.15
+current_version = 0.17.16
 commit = True
 message = Update version {current_version} -> {new_version}
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.17.16](https://github.com/IBM/platform-services-python-sdk/compare/v0.17.15...v0.17.16) (2021-03-24)
+
+
+### Bug Fixes
+
+* remove dotenv ([#95](https://github.com/IBM/platform-services-python-sdk/issues/95)) ([c957981](https://github.com/IBM/platform-services-python-sdk/commit/c957981097897c639c4f1694bd86b76cd8afd3c7))
+
 ## [0.17.15](https://github.com/IBM/platform-services-python-sdk/compare/v0.17.14...v0.17.15) (2021-03-18)
 
 

README.md

@@ -7,7 +7,7 @@
 [![codecov](https://codecov.io/gh/IBM/platform-services-python-sdk/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/platform-services-python-sdk)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Cloud Platform Services Python SDK Version 0.17.15
+# IBM Cloud Platform Services Python SDK Version 0.17.16
 
 Python client library to interact with various 
 [IBM Cloud Platform Service APIs](https://cloud.ibm.com/docs?tab=api-docs&category=platform_services).
@@ -80,13 +80,13 @@ Service Name | Imported Class Name
 To install, use `pip` or `easy_install`:
 
 ```bash
-pip install --upgrade "ibm-platform-services>=0.17.15"
+pip install --upgrade "ibm-platform-services>=0.17.16"
 ```
 
 or
 
 ```bash
-easy_install --upgrade "ibm-platform-services>=0.17.15"
+easy_install --upgrade "ibm-platform-services>=0.17.16"
 ```
 
 ## Using the SDK

ibm_platform_services/version.py

@@ -1,4 +1,4 @@
 """
 Version of platform_services
 """
-__version__ = '0.17.15'
+__version__ = '0.17.16'

package-lock.json

@@ -19,7 +19,7 @@
 import sys
 import pkg_resources
 
-__version__ = '0.17.15'
+__version__ = '0.17.16'
 PACKAGE_NAME = 'ibm_platform_services'
 PACKAGE_DESC = 'Python client library for IBM Cloud Platform Services'
 

setup.py

@@ -28,7 +28,6 @@
 from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 from ibm_cloud_sdk_core import *
 from ibm_platform_services.enterprise_management_v1 import *
-from dotenv import load_dotenv
 import time, datetime
 import math
 import random

test/integration/test_enterprise_management_v1.py

@@ -21,18 +21,9 @@
 from ibm_cloud_sdk_core import *
 from ibm_platform_services.global_catalog_v1 import *
 import pytest
-from dotenv import load_dotenv
 import time
 
-configFile = 'global_catalog.env'
-configLoaded = None
-config = {}
-
-if os.path.exists(configFile):
-    load_dotenv(dotenv_path=configFile)
-    configLoaded = True
-else:
-    print('External configuration was not found, skipping tests...')
+config_file = 'global_catalog.env'
 
 
 class TestGlobalCatalogV1(unittest.TestCase):
@@ -41,7 +32,9 @@ class TestGlobalCatalogV1(unittest.TestCase):
     """
     @classmethod
     def setUpClass(self):
-        if not configLoaded:
+        if os.path.exists(config_file):
+            os.environ['IBM_CREDENTIALS_FILE'] = config_file
+        else:
             raise unittest.SkipTest(
                 'External configuration not available, skipping...')
 

test/integration/test_global_catalog_v1.py

@@ -26,7 +26,6 @@
 import time
 from ibm_cloud_sdk_core import *
 from ibm_platform_services.open_service_broker_v1 import *
-from dotenv import load_dotenv
 
 # Read config file
 configFile = 'open_service_broker.env'