Refactor directory structure to enable 'from msgraph.core' import format

Author: samwelkanda

.pre-commit-config.yaml

@@ -21,19 +21,12 @@ repos:
         name: pylint
         stages: [commit]
         language: system
-        entry: pipenv run pylint msgraphcore --disable=W --rcfile=.pylintrc
+        entry: pipenv run pylint msgraph --disable=W --rcfile=.pylintrc
         types: [python]
 
       - id: pytest-unit
         name: pytest-unit
         stages: [commit]
         language: system
-        entry: pipenv run coverage run -m pytest tests/unit
-        types: [python]
-
-      - id: pytest-integration
-        name: pytest-integration
-        stages: [commit]
-        language: system
-        entry: pipenv run coverage run -m pytest tests/integration
+        entry: pipenv run pytest
         types: [python]

msgraph/__init__.py

@@ -0,0 +1,4 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# -----------------------------------

msgraph/core/__init__.py

@@ -0,0 +1,5 @@
+from .client_factory import HTTPClientFactory
+from .constants import SDK_VERSION
+from .graph_client import GraphClient
+
+__version__ = SDK_VERSION

msgraphcore/client_factory.py renamed to msgraph/core/client_factory.py

@@ -3,11 +3,11 @@
 
 from requests import Session
 
-from msgraphcore.constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
-from msgraphcore.enums import APIVersion, NationalClouds
-from msgraphcore.middleware.abc_token_credential import TokenCredential
-from msgraphcore.middleware.authorization import AuthorizationHandler
-from msgraphcore.middleware.middleware import BaseMiddleware, MiddlewarePipeline
+from .constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
+from .enums import APIVersion, NationalClouds
+from .middleware.abc_token_credential import TokenCredential
+from .middleware.authorization import AuthorizationHandler
+from .middleware.middleware import BaseMiddleware, MiddlewarePipeline
 
 
 class HTTPClientFactory:

msgraphcore/constants.py renamed to msgraph/core/constants.py

@@ -2,10 +2,10 @@
 
 from requests import Request, Session
 
-from msgraphcore.client_factory import HTTPClientFactory
-from msgraphcore.middleware.abc_token_credential import TokenCredential
-from msgraphcore.middleware.middleware import BaseMiddleware
-from msgraphcore.middleware.request_context import RequestContext
+from .client_factory import HTTPClientFactory
+from .middleware.abc_token_credential import TokenCredential
+from .middleware.middleware import BaseMiddleware
+from .middleware.request_context import RequestContext
 
 supported_options = ['scopes', 'custom_option']
 

msgraphcore/enums.py renamed to msgraph/core/enums.py

@@ -1,6 +1,6 @@
-from msgraphcore.enums import FeatureUsageFlag
-from msgraphcore.middleware.abc_token_credential import TokenCredential
-from msgraphcore.middleware.middleware import BaseMiddleware
+from ..enums import FeatureUsageFlag
+from .abc_token_credential import TokenCredential
+from .middleware import BaseMiddleware
 
 
 class AuthorizationHandler(BaseMiddleware):

msgraphcore/graph_client.py renamed to msgraph/core/graph_client.py

@@ -4,7 +4,7 @@
 from requests.adapters import HTTPAdapter
 from urllib3 import PoolManager
 
-from msgraphcore.middleware.request_context import RequestContext
+from .request_context import RequestContext
 
 
 class MiddlewarePipeline(HTTPAdapter):

msgraph/core/middleware/__init__.py

@@ -1,6 +1,6 @@
 import uuid
 
-from msgraphcore.enums import FeatureUsageFlag
+from ..enums import FeatureUsageFlag
 
 
 class RequestContext:

msgraphcore/middleware/abc_token_credential.py renamed to msgraph/core/middleware/abc_token_credential.py

@@ -3,7 +3,7 @@
 
 from azure.identity import InteractiveBrowserCredential
 
-from msgraphcore.graph_client import GraphClient
+from msgraph.core.graph_client import GraphClient
 
 scopes = ['user.read']
 browser_credential = InteractiveBrowserCredential(client_id='YOUR_CLIENT_ID')

msgraphcore/middleware/authorization.py renamed to msgraph/core/middleware/authorization.py

@@ -1,9 +1,9 @@
 import pytest
 from requests import Session
 
-from msgraphcore.enums import APIVersion
-from msgraphcore.graph_client import GraphClient
-from msgraphcore.middleware.authorization import AuthorizationHandler
+from msgraph.core.enums import APIVersion
+from msgraph.core.graph_client import GraphClient
+from msgraph.core.middleware.authorization import AuthorizationHandler
 
 
 class _CustomTokenCredential:

msgraphcore/middleware/middleware.py renamed to msgraph/core/middleware/middleware.py

@@ -1,9 +1,9 @@
 import pytest
 from requests import Session
 
-from msgraphcore.client_factory import HTTPClientFactory
-from msgraphcore.enums import APIVersion
-from msgraphcore.middleware.authorization import AuthorizationHandler
+from msgraph.core.client_factory import HTTPClientFactory
+from msgraph.core.enums import APIVersion
+from msgraph.core.middleware.authorization import AuthorizationHandler
 
 
 class _CustomTokenCredential:

msgraphcore/middleware/request_context.py renamed to msgraph/core/middleware/request_context.py

@@ -1,7 +1,7 @@
 import pytest
 
-from msgraphcore.middleware.authorization import AuthorizationHandler
-from msgraphcore.middleware.request_context import RequestContext
+from msgraph.core.middleware.authorization import AuthorizationHandler
+from msgraph.core.middleware.request_context import RequestContext
 
 
 def test_context_options_override_default_scopes():

msgraphcore/__init__.py

@@ -2,11 +2,11 @@
 from requests import Session
 from requests.adapters import HTTPAdapter
 
-from msgraphcore.client_factory import HTTPClientFactory
-from msgraphcore.constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
-from msgraphcore.enums import APIVersion, NationalClouds
-from msgraphcore.middleware.authorization import AuthorizationHandler
-from msgraphcore.middleware.middleware import BaseMiddleware, MiddlewarePipeline
+from msgraph.core.client_factory import HTTPClientFactory
+from msgraph.core.constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
+from msgraph.core.enums import APIVersion, NationalClouds
+from msgraph.core.middleware.authorization import AuthorizationHandler
+from msgraph.core.middleware.middleware import BaseMiddleware, MiddlewarePipeline
 
 
 def test_initialize_with_default_config():

samples/samples.py

@@ -3,11 +3,11 @@
 from requests import Session
 from requests.adapters import HTTPAdapter
 
-from msgraphcore.constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
-from msgraphcore.enums import APIVersion, NationalClouds
-from msgraphcore.graph_client import GraphClient
-from msgraphcore.middleware.authorization import AuthorizationHandler
-from msgraphcore.middleware.middleware import BaseMiddleware, MiddlewarePipeline
+from msgraph.core.constants import CONNECTION_TIMEOUT, REQUEST_TIMEOUT
+from msgraph.core.enums import APIVersion, NationalClouds
+from msgraph.core.graph_client import GraphClient
+from msgraph.core.middleware.authorization import AuthorizationHandler
+from msgraph.core.middleware.middleware import BaseMiddleware, MiddlewarePipeline
 
 
 def test_graph_client_with_default_middleware():

tests/__init__.py

@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from unittest import TestCase
 
-from msgraphcore.middleware.middleware import BaseMiddleware, MiddlewarePipeline
+from msgraph.core.middleware.middleware import BaseMiddleware, MiddlewarePipeline
 
 
 class MiddlewarePipelineTest(TestCase):