Merge pull request #2110 from allmightyspiff/master

v6.1.10 version bump

Author: allmightyspiff

SoftLayer/consts.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-VERSION = 'v6.1.9'
+VERSION = 'v6.1.10'
 API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3.1/'
 API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
 API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'

setup.py

@@ -3,7 +3,6 @@
 import os
 
 from setuptools import setup, find_packages
-
 # pylint: disable=inconsistent-return-statements
 
 DESCRIPTION = "A library for SoftLayer's API"
@@ -16,7 +15,7 @@
 
 setup(
     name='SoftLayer',
-    version='6.1.9',
+    version='v6.1.10',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/x-rst',

tests/functional_tests.py

@@ -19,8 +19,7 @@ def _get_creds(self):
                                     'variables not set')
 
         return {
-            'endpoint': (os.environ.get('SL_API_ENDPOINT') or
-                         SoftLayer.API_PUBLIC_ENDPOINT),
+            'endpoint': (SoftLayer.API_PUBLIC_ENDPOINT),
             'username': os.environ['SL_USERNAME'],
             'api_key': os.environ['SL_API_KEY']
         }
@@ -30,7 +29,7 @@ class UnauthedUser(FunctionalTest):
 
     def test_failed_auth(self):
         client = SoftLayer.Client(
-            username='doesnotexist', api_key='issurelywrong', timeout=20)
+            username='doesnotexist', api_key='issurelywrong', timeout=20, endpoint_url=SoftLayer.API_PUBLIC_ENDPOINT)
         self.assertRaises(
             SoftLayer.SoftLayerAPIError,
             client['SoftLayer_User_Customer'].getPortalLoginToken)