From 117c73f285c8b90759432e4d7441917d37bcc09e Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 17 Nov 2020 10:15:28 -0800 Subject: [PATCH 1/4] allow user to enable env AZURE_PURE_CORE to opt in "small core" --- sdk/core/azure-core/azure/core/__init__.py | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sdk/core/azure-core/azure/core/__init__.py b/sdk/core/azure-core/azure/core/__init__.py index 40ed75d540a6..6b6d7128d3b6 100644 --- a/sdk/core/azure-core/azure/core/__init__.py +++ b/sdk/core/azure-core/azure/core/__init__.py @@ -27,17 +27,22 @@ from ._version import VERSION __version__ = VERSION -from ._pipeline_client import PipelineClient -from ._match_conditions import MatchConditions +import os +if os.environ.get('AZURE_PURE_CORE', False): + pass +else: + from ._pipeline_client import PipelineClient + from ._match_conditions import MatchConditions -__all__ = [ - "PipelineClient", - "MatchConditions" -] -try: - from ._pipeline_client_async import AsyncPipelineClient #pylint: disable=unused-import - __all__.extend(["AsyncPipelineClient"]) -except (ImportError, SyntaxError): # Python <= 3.5 - pass + __all__ = [ + "PipelineClient", + "MatchConditions" + ] + + try: + from ._pipeline_client_async import AsyncPipelineClient #pylint: disable=unused-import + __all__.extend(["AsyncPipelineClient"]) + except (ImportError, SyntaxError): # Python <= 3.5 + pass From 3309325e5527755d85cd96315b47a86e3cf14beb Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 17 Nov 2020 10:47:33 -0800 Subject: [PATCH 2/4] update --- sdk/core/azure-core/azure/core/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/azure-core/azure/core/__init__.py b/sdk/core/azure-core/azure/core/__init__.py index 6b6d7128d3b6..e05df32b070b 100644 --- a/sdk/core/azure-core/azure/core/__init__.py +++ b/sdk/core/azure-core/azure/core/__init__.py @@ -24,10 +24,10 @@ # # -------------------------------------------------------------------------- +import os from ._version import VERSION __version__ = VERSION -import os if os.environ.get('AZURE_PURE_CORE', False): pass From 188c90dde72dd1c2415ec9b5dee4cc8461891f08 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 17 Nov 2020 15:06:55 -0800 Subject: [PATCH 3/4] update --- sdk/core/azure-core/azure/core/__init__.py | 6 +++--- .../core/{_match_conditions.py => match_conditions.py} | 0 .../azure/core/{_pipeline_client.py => pipeline_client.py} | 0 .../{_pipeline_client_async.py => pipeline_client_async.py} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk/core/azure-core/azure/core/{_match_conditions.py => match_conditions.py} (100%) rename sdk/core/azure-core/azure/core/{_pipeline_client.py => pipeline_client.py} (100%) rename sdk/core/azure-core/azure/core/{_pipeline_client_async.py => pipeline_client_async.py} (100%) diff --git a/sdk/core/azure-core/azure/core/__init__.py b/sdk/core/azure-core/azure/core/__init__.py index e05df32b070b..1c085424fe1e 100644 --- a/sdk/core/azure-core/azure/core/__init__.py +++ b/sdk/core/azure-core/azure/core/__init__.py @@ -32,8 +32,8 @@ if os.environ.get('AZURE_PURE_CORE', False): pass else: - from ._pipeline_client import PipelineClient - from ._match_conditions import MatchConditions + from .pipeline_client import PipelineClient + from .match_conditions import MatchConditions __all__ = [ @@ -42,7 +42,7 @@ ] try: - from ._pipeline_client_async import AsyncPipelineClient #pylint: disable=unused-import + from .pipeline_client_async import AsyncPipelineClient #pylint: disable=unused-import __all__.extend(["AsyncPipelineClient"]) except (ImportError, SyntaxError): # Python <= 3.5 pass diff --git a/sdk/core/azure-core/azure/core/_match_conditions.py b/sdk/core/azure-core/azure/core/match_conditions.py similarity index 100% rename from sdk/core/azure-core/azure/core/_match_conditions.py rename to sdk/core/azure-core/azure/core/match_conditions.py diff --git a/sdk/core/azure-core/azure/core/_pipeline_client.py b/sdk/core/azure-core/azure/core/pipeline_client.py similarity index 100% rename from sdk/core/azure-core/azure/core/_pipeline_client.py rename to sdk/core/azure-core/azure/core/pipeline_client.py diff --git a/sdk/core/azure-core/azure/core/_pipeline_client_async.py b/sdk/core/azure-core/azure/core/pipeline_client_async.py similarity index 100% rename from sdk/core/azure-core/azure/core/_pipeline_client_async.py rename to sdk/core/azure-core/azure/core/pipeline_client_async.py From 0f58b02f37458b49adbb594cb543af7642421a00 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 17 Nov 2020 15:17:54 -0800 Subject: [PATCH 4/4] update --- sdk/core/azure-core/azure/core/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/core/azure-core/azure/core/__init__.py b/sdk/core/azure-core/azure/core/__init__.py index 1c085424fe1e..6d5c0a91bf6d 100644 --- a/sdk/core/azure-core/azure/core/__init__.py +++ b/sdk/core/azure-core/azure/core/__init__.py @@ -28,10 +28,7 @@ from ._version import VERSION __version__ = VERSION - -if os.environ.get('AZURE_PURE_CORE', False): - pass -else: +if not os.environ.get('AZURE_PURE_CORE', None) == 'True': from .pipeline_client import PipelineClient from .match_conditions import MatchConditions