diff --git a/sdk/appconfiguration/azure-data-appconfiguration/README.rst b/sdk/appconfiguration/azure-data-appconfiguration/README.rst deleted file mode 100644 index 4a34bbb20c3f..000000000000 --- a/sdk/appconfiguration/azure-data-appconfiguration/README.rst +++ /dev/null @@ -1,33 +0,0 @@ -Microsoft Azure SDK for Python -============================== - -This is the Microsoft Azure MyService Management Client Library. - -Azure Resource Manager (ARM) is the next generation of management APIs that -replace the old Azure Service Management (ASM). - -This package has been tested with Python 2.7, 3.5, 3.6 and 3.7. - -For the older Azure Service Management (ASM) libraries, see -`azure-servicemanagement-legacy `__ library. - -For a more complete set of Azure libraries, see the `azure `__ bundle package. - - -Usage -===== - -For code examples, see `MyService Management -`__ -on docs.microsoft.com. - - -Provide Feedback -================ - -If you encounter any bugs or have suggestions, please file an issue in the -`Issues `__ -section of the project. - - -.. image:: https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-data-appconfiguration%2FREADME.png diff --git a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/__init__.py b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/__init__.py index 9c262c5008dc..a66bbe2dc083 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/__init__.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/__init__.py @@ -12,7 +12,7 @@ from .azure_appconfiguration_client import AzureAppConfigurationClient from ._generated.models import ConfigurationSetting -__version__ = "0.1" +__version__ = "1.0.0b2" __all__ = [ 'AzureAppConfigurationClient', 'ConfigurationSetting', diff --git a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/_configuration.py b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/_configuration.py index db2230df6e00..8f15bfe23db9 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/_configuration.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/_configuration.py @@ -4,7 +4,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -34,11 +34,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + 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.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) diff --git a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/aio/_configuration_async.py b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/aio/_configuration_async.py index 2dbc20b33725..889b9210fbaa 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/aio/_configuration_async.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/_generated/aio/_configuration_async.py @@ -34,10 +34,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + 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.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/aio/azure_configuration_client_async.py b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/aio/azure_configuration_client_async.py index f26d7278e4dd..6b9f12532d2a 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/aio/azure_configuration_client_async.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/aio/azure_configuration_client_async.py @@ -89,14 +89,15 @@ class AzureAppConfigurationClient(): @classmethod def from_connection_string( cls, connection_string, # type: str + **kwargs ): - return cls(connection_string=connection_string) + return cls(connection_string, **kwargs) - def __init__(self, connection_string): + def __init__(self, connection_string, **kwargs): base_url = "https://" + get_endpoint_from_connection_string(connection_string) program_name = os.path.basename(sys.argv[0]) or "noprogram" self.config = ConfigurationClientConfiguration( - connection_string, base_user_agent=program_name, logging_enable=True + connection_string, **kwargs ) self.config.user_agent_policy.add_user_agent( "{}{}".format(platform.python_implementation(), platform.python_version()) @@ -170,7 +171,7 @@ def list_configuration_settings( key=keys, fields=fields, accept_date_time=accept_date_time, - headers=kwargs.get("headers"), + **kwargs ) @distributed_trace_async diff --git a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/azure_appconfiguration_client.py b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/azure_appconfiguration_client.py index 930baa08cd48..a42be25f93e4 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/azure_appconfiguration_client.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/azure/data/appconfiguration/azure_appconfiguration_client.py @@ -87,14 +87,15 @@ class AzureAppConfigurationClient(): @classmethod def from_connection_string( cls, connection_string, # type: str + **kwargs ): - return cls(connection_string=connection_string) + return cls(connection_string, **kwargs) - def __init__(self, connection_string): + def __init__(self, connection_string, **kwargs): base_url = "https://" + get_endpoint_from_connection_string(connection_string) program_name = os.path.basename(sys.argv[0]) or "noprogram" self.config = ConfigurationClientConfiguration( - connection_string, base_user_agent=program_name, logging_enable=True + connection_string, **kwargs ) self.config.user_agent_policy.add_user_agent( "{}{}".format(platform.python_implementation(), platform.python_version()) diff --git a/sdk/appconfiguration/azure-data-appconfiguration/sdk_packaging.toml b/sdk/appconfiguration/azure-data-appconfiguration/sdk_packaging.toml index 5a9f0fdcafa0..d40289d44b2b 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/sdk_packaging.toml +++ b/sdk/appconfiguration/azure-data-appconfiguration/sdk_packaging.toml @@ -1,8 +1,9 @@ [packaging] package_name = "azure-data-appconfiguration" package_nspkg = "azure-data-nspkg" -package_pprint_name = "MyService Management" +package_pprint_name = "App Configuration Data" package_doc_id = "" is_stable = false -is_arm = true -need_msrestazure = true +is_arm = false +need_msrestazure = false +auto_update = false diff --git a/sdk/appconfiguration/azure-data-appconfiguration/setup.py b/sdk/appconfiguration/azure-data-appconfiguration/setup.py index 36706a9bad28..723672471501 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/setup.py +++ b/sdk/appconfiguration/azure-data-appconfiguration/setup.py @@ -6,6 +6,7 @@ # license information. #-------------------------------------------------------------------------- +import sys import re import os.path from io import open @@ -13,7 +14,7 @@ # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-data-appconfiguration" -PACKAGE_PPRINT_NAME = "MyService Management" +PACKAGE_PPRINT_NAME = "App Configuration Data" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace('-', '/') @@ -36,30 +37,42 @@ pass # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', +with open(os.path.join(package_folder_path, '__init__.py'), 'r') as fd: + version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) if not version: raise RuntimeError('Cannot find version information') -with open('README.rst', encoding='utf-8') as f: +with open('README.md', encoding='utf-8') as f: readme = f.read() -with open('HISTORY.rst', encoding='utf-8') as f: +with open('HISTORY.md', encoding='utf-8') as f: history = f.read() +exclude_packages = [ + 'tests', + 'examples', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + ] +if sys.version_info < (3, 5, 3): + exclude_packages.extend([ + '*.aio', + '*.aio.*' + ]) + setup( name=PACKAGE_NAME, version=version, - description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), + description='Microsoft {} Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, - long_description_content_type='text/x-rst', + long_description_content_type='text/markdown', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', - url='https://github.com/Azure/azure-sdk-for-python', + url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-data-appconfiguration', classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 3 - Alpha', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', @@ -70,18 +83,17 @@ 'License :: OSI Approved :: MIT License', ], zip_safe=False, - packages=find_packages(exclude=[ - 'tests', - # Exclude packages that will be covered by PEP420 or nspkg - 'azure', - 'azure.data', - ]), + packages=find_packages(exclude=exclude_packages), install_requires=[ - 'msrest>=0.5.0', - 'msrestazure>=0.4.32,<2.0.0', - 'azure-common~=1.1', + "azure-core>=1.0.0b2", ], extras_require={ - ":python_version<'3.0'": ['azure-data-nspkg'], + ":python_version<'3.0'": ['azure-nspkg'], + ":python_version<'3.4'": ['enum34>=1.0.4'], + ":python_version<'3.5'": ['typing'], + "async:python_version>='3.5'": [ + 'aiohttp>=3.0', + 'aiodns>=2.0' + ], } -) +) \ No newline at end of file