Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions scripts/auto_release/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,21 @@ def check_changelog_file(self):
self.edit_changelog()

@staticmethod
def get_need_dependency():
def get_need_dependency() -> List[str]:
template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py')
items = ["msrest>", "azure-mgmt-core", "typing_extensions"]
with open(template_path, 'r') as fr:
content = fr.readlines()
for line in content:
if 'msrest>' in line:
target_msrest = line.strip().strip(',').strip('\'')
yield target_msrest
if 'azure-mgmt-core' in line:
target_mgmt_core = line.strip().strip(',').strip('\'')
yield target_mgmt_core
dependencies = []
for i in range(len(content)):
if "install_requires" not in content[i]:
continue
for j in range(i, len(content)):
for item in items:
if item in content[j]:
dependencies.append(content[j].strip().strip(',').strip('\"'))
break
return dependencies

@staticmethod
def insert_line_num(content: List[str]) -> int:
Expand All @@ -404,24 +408,22 @@ def insert_line_num(content: List[str]) -> int:
def check_ci_file_proc(self, dependency: str):
def edit_ci_file(content: List[str]):
new_line = f'#override azure-mgmt-{self.package_name} {dependency}'
dependency_name = dependency.split('>')[0]
dependency_name = re.compile("[a-zA-Z-_]*").findall(dependency)[0]
for i in range(len(content)):
if new_line in content[i]:
return
if f'azure-mgmt-{self.package_name} {dependency_name}' in content[i]:
content[i] = new_line + '\n'
return
prefix = '' if '\n' in content[-1] else '\n'
content.insert(self.insert_line_num(content), prefix + new_line + '\n')
content.insert(self.insert_line_num(content), new_line + '\n')

modify_file(str(Path('shared_requirements.txt')), edit_ci_file)
print_exec('git add shared_requirements.txt')

def check_ci_file(self):
# eg: target_msrest = 'msrest>=0.6.21', target_mgmt_core = 'azure-mgmt-core>=1.3.0,<2.0.0'
target_msrest, target_mgmt_core = list(self.get_need_dependency())
self.check_ci_file_proc(target_msrest)
self.check_ci_file_proc(target_mgmt_core)
# eg: 'msrest>=0.6.21', 'azure-mgmt-core>=1.3.0,<2.0.0'
for item in self.get_need_dependency():
self.check_ci_file_proc(item)

def check_dev_requirement(self):
file = Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}/dev_requirements.txt')
Expand Down
4 changes: 4 additions & 0 deletions sdk/datadog/azure-mgmt-datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release History

## 0.0.0 (it should be stable) (2022-10-26)



## 2.0.0 (2021-05-26)

**Features**
Expand Down
4 changes: 3 additions & 1 deletion sdk/datadog/azure-mgmt-datadog/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
include _meta.json
recursive-include tests *.py *.yaml
recursive-include tests *.py *.json
recursive-include samples *.py *.md
include *.md
include azure/__init__.py
include azure/mgmt/__init__.py
include LICENSE
include azure/mgmt/datadog/py.typed
4 changes: 1 addition & 3 deletions sdk/datadog/azure-mgmt-datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Microsoft Azure SDK for Python

This is the Microsoft Azure Datadog Management Client Library.
This package has been tested with Python 3.6+.
This package has been tested with Python 3.7+.
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).

## _Disclaimer_
Expand All @@ -12,8 +12,6 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For


To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)



For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
Code samples for this package can be found at [Datadog Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
Expand Down
12 changes: 6 additions & 6 deletions sdk/datadog/azure-mgmt-datadog/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"autorest": "3.4.2",
"commit": "5364e029a395c84bdbf7ad3dda8ac84705e58529",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"use": [
"@autorest/python@5.8.0",
"@autorest/modelerfour@4.19.1"
"@autorest/python@6.2.1",
"@autorest/modelerfour@4.24.3"
],
"commit": "2e3f1e0c67ee7da1d681a26b6b23b888ce856695",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/datadog/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/modelerfour@4.19.1 --version=3.4.2",
"autorest_command": "autorest specification/datadog/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.1 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
"readme": "specification/datadog/resource-manager/readme.md"
}
18 changes: 14 additions & 4 deletions sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,20 @@
# --------------------------------------------------------------------------

from ._microsoft_datadog_client import MicrosoftDatadogClient
__all__ = ['MicrosoftDatadogClient']
from ._version import VERSION

__version__ = VERSION

try:
from ._patch import patch_sdk # type: ignore
patch_sdk()
from ._patch import __all__ as _patch_all
from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import
except ImportError:
pass
_patch_all = []
from ._patch import patch_sdk as _patch_sdk

__all__ = [
"MicrosoftDatadogClient",
]
__all__.extend([p for p in _patch_all if p not in __all__])

_patch_sdk()
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,70 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING
import sys
from typing import Any, TYPE_CHECKING

from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy

from ._version import VERSION

if sys.version_info >= (3, 8):
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
else:
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any

from azure.core.credentials import TokenCredential

VERSION = "unknown"

class MicrosoftDatadogClientConfiguration(Configuration):
class MicrosoftDatadogClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
"""Configuration for MicrosoftDatadogClient.

Note that all parameters used to create this instance are saved as instance
attributes.

:param credential: Credential needed for the client to connect to Azure.
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription.
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2022-06-01". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(
self,
credential, # type: "TokenCredential"
subscription_id, # type: str
**kwargs # type: Any
):
# type: (...) -> None
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(MicrosoftDatadogClientConfiguration, self).__init__(**kwargs)
api_version = kwargs.pop("api_version", "2022-06-01") # type: Literal["2022-06-01"]

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
super(MicrosoftDatadogClientConfiguration, self).__init__(**kwargs)

self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2021-03-01"
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'mgmt-datadog/{}'.format(VERSION))
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "mgmt-datadog/{}".format(VERSION))
self._configure(**kwargs)

def _configure(
self,
**kwargs # type: Any
self, **kwargs # type: Any
):
# type: (...) -> None
self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs)
self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
self.authentication_policy = kwargs.get('authentication_policy')
self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
if self.credential and not self.authentication_policy:
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
self.authentication_policy = ARMChallengeAuthenticationPolicy(
self.credential, *self.credential_scopes, **kwargs
)
107 changes: 0 additions & 107 deletions sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_metadata.json

This file was deleted.

Loading