ibm-cloud-sdk-core 3.20.2__tar.gz → 3.20.4__tar.gz

{ibm-cloud-sdk-core-3.20.2/ibm_cloud_sdk_core.egg-info → ibm-cloud-sdk-core-3.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ibm-cloud-sdk-core
-Version: 3.20.2
+Version: 3.20.4
 Summary: Core library used by SDKs for IBM Cloud Services
 Home-page: https://github.com/IBM/python-sdk-core
 Author: IBM
@@ -29,7 +29,7 @@ License-File: LICENSE
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![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 Python SDK Core Version 3.20.2
+# IBM Python SDK Core Version 3.20.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 

{ibm-cloud-sdk-core-3.20.2 → ibm-cloud-sdk-core-3.20.4}/README.md

@@ -4,7 +4,7 @@
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![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 Python SDK Core Version 3.20.2
+# IBM Python SDK Core Version 3.20.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 

{ibm-cloud-sdk-core-3.20.2 → ibm-cloud-sdk-core-3.20.4}/ibm_cloud_sdk_core/http_adapter.py

@@ -1,10 +1,10 @@
 import ssl
 
+from requests import certs
 from requests.adapters import HTTPAdapter, DEFAULT_POOLBLOCK
 from urllib3.util.ssl_ import create_urllib3_context
 
 
-# pylint: disable=fixme
 class SSLHTTPAdapter(HTTPAdapter):
     """Wraps the original HTTP adapter and adds additional SSL context."""
 
@@ -17,7 +17,8 @@ class SSLHTTPAdapter(HTTPAdapter):
         """Create and use custom SSL configuration."""
 
         ssl_context = create_urllib3_context()
-        ssl_context.load_default_certs()
+        # NOTE: https://github.com/psf/requests/pull/6731/files#r1622893724
+        ssl_context.load_verify_locations(certs.where())
         ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
 
         if self._disable_ssl_verification:

ibm-cloud-sdk-core-3.20.4/ibm_cloud_sdk_core/version.py

@@ -0,0 +1 @@
+__version__ = '3.20.4'

{ibm-cloud-sdk-core-3.20.2 → ibm-cloud-sdk-core-3.20.4/ibm_cloud_sdk_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ibm-cloud-sdk-core
-Version: 3.20.2
+Version: 3.20.4
 Summary: Core library used by SDKs for IBM Cloud Services
 Home-page: https://github.com/IBM/python-sdk-core
 Author: IBM
@@ -29,7 +29,7 @@ License-File: LICENSE
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![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 Python SDK Core Version 3.20.2
+# IBM Python SDK Core Version 3.20.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 

{ibm-cloud-sdk-core-3.20.2 → ibm-cloud-sdk-core-3.20.4}/setup.py

@@ -17,9 +17,8 @@ import os
 import sys
 import pkg_resources
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
 
-__version__ = '3.20.2'
+__version__ = '3.20.4'
 
 if sys.argv[-1] == 'publish':
     # test server
@@ -36,22 +35,6 @@ with open('requirements.txt', encoding='utf-8') as f:
 with open('requirements-dev.txt', encoding='utf-8') as f:
     tests_require = [str(req) for req in pkg_resources.parse_requirements(f)]
 
-
-class PyTest(TestCommand):
-    """PyTest class."""
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = ['--strict', '--verbose', '--tb=long', 'test']
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-
-        errcode = pytest.main(self.test_args)
-        sys.exit(errcode)
-
-
 with open("README.md", "r", encoding='utf-8') as fh:
     readme = fh.read()
 
@@ -62,7 +45,6 @@ setup(
     license='Apache 2.0',
     install_requires=install_requires,
     tests_require=tests_require,
-    cmdclass={'test': PyTest},
     author='IBM',
     author_email='devxsdk@us.ibm.com',
     long_description=readme,

{ibm-cloud-sdk-core-3.20.2 → ibm-cloud-sdk-core-3.20.4}/test/test_http_adapter.py

@@ -3,12 +3,12 @@ import os
 import threading
 import warnings
 from http.server import HTTPServer, SimpleHTTPRequestHandler
-from ssl import get_default_verify_paths, SSLContext, PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2
+from ssl import SSLContext, PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2
 from typing import Callable
 
 import pytest
 import urllib3
-from requests.exceptions import SSLError
+from requests import exceptions
 
 from ibm_cloud_sdk_core.base_service import BaseService
 from ibm_cloud_sdk_core.authenticators import NoAuthAuthenticator
@@ -71,7 +71,7 @@ def test_tls_v1_1():
     with pytest.raises(Exception) as exception:
         service.send(prepped, verify=cert)
     # Errors can be differ based on the Python version.
-    assert exception.type is SSLError or exception.type is ConnectionError
+    assert exception.type is exceptions.SSLError or exception.type is exceptions.ConnectionError
 
 
 @_local_server(PROTOCOL_TLSv1_2, 3334)
@@ -82,7 +82,7 @@ def test_tls_v1_2():
     # It should fail due to the self-signed SSL cert.
     assert service.disable_ssl_verification is False
     prepped = service.prepare_request('GET', url='/')
-    with pytest.raises(SSLError, match='certificate verify failed: self-signed certificate'):
+    with pytest.raises(exceptions.SSLError, match='certificate verify failed: self-signed certificate'):
         res = service.send(prepped)
 
     # Next configure it to validate by using our local certificate. Should raise no exception.
@@ -105,17 +105,6 @@ def test_tls_v1_2():
 
     ssl_context = service.http_adapter.poolmanager.connection_pool_kw.get("ssl_context")
     assert ssl_context is not None
-    # In some cases (especially in Ubuntu containers that we use for testing on Travis)
-    # the default CA certificates are stored in a different place, so let's try to
-    # load those before making the final decision for this test case.
-    if len(ssl_context.get_ca_certs()) == 0:
-        try:
-            default_ca_path = get_default_verify_paths().capath
-            ssl_context.load_verify_locations(os.path.join(default_ca_path, 'ca-certificates.crt'))
-        except:
-            # Errors are ignored, let's jump straight to the assertion.
-            pass
-
     assert len(ssl_context.get_ca_certs()) > 0
 
     prepped = service.prepare_request('GET', url='/status')

ibm-cloud-sdk-core-3.20.2/ibm_cloud_sdk_core/version.py

@@ -1 +0,0 @@
-__version__ = '3.20.2'