Remove resources post test

sdk/tables/azure-data-tables/MANIFEST.in

@@ -1,6 +1,5 @@
+recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/data/__init__.py
-include LICENSE.txt
-recursive-include tests *.py
-recursive-include samples *.py *.md
+

sdk/tables/azure-data-tables/azure/__init__.py

@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: str
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

sdk/tables/azure-data-tables/azure/data/__init__.py

@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: str
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

sdk/tables/azure-data-tables/dev_requirements.txt

@@ -3,4 +3,4 @@
 ../../core/azure-core
 cryptography>=2.1.4
 aiohttp>=3.0; python_version >= '3.5'
-
+../../identity/azure-identity

sdk/tables/azure-data-tables/sdk_packaging.toml

@@ -0,0 +1,8 @@
+[packaging]
+package_name = "azure-data-tables"
+package_nspkg = "azure-data-nspkg"
+package_pprint_name = "MyService Management"
+package_doc_id = ""
+is_stable = false
+is_arm = true
+need_msrestazure = true

sdk/tables/azure-data-tables/setup.py

@@ -9,11 +9,11 @@
 import re
 import os.path
 from io import open
-from setuptools import find_packages, setup  # type: ignore
+from setuptools import find_packages, setup
 
 # Change the PACKAGE_NAME only to change folder and different name
 PACKAGE_NAME = "azure-data-tables"
-PACKAGE_PPRINT_NAME = "Azure Data Tables"
+PACKAGE_PPRINT_NAME = "MyService Management"
 
 # a-b-c => a/b/c
 package_folder_path = PACKAGE_NAME.replace('-', '/')
@@ -25,7 +25,7 @@
 try:
     import azure
     try:
-        ver = azure.__version__  # type: ignore
+        ver = azure.__version__
         raise Exception(
             'This package is incompatible with azure=={}. '.format(ver) +
             'Uninstall it with "pip uninstall azure".'
@@ -36,25 +36,32 @@
     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*[\'"]([^\'"]*)[\'"]',  # type: ignore
+with open(os.path.join(package_folder_path, 'version.py')
+          if os.path.exists(os.path.join(package_folder_path, 'version.py'))
+          else os.path.join(package_folder_path, '_version.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.md', encoding='utf-8') as f:
+    readme = f.read()
+with open('CHANGELOG.md', encoding='utf-8') as f:
+    changelog = f.read()
+
 setup(
     name=PACKAGE_NAME,
     version=version,
     description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
-    long_description='\n\n',
+    long_description=readme + '\n\n' + changelog,
     long_description_content_type='text/markdown',
     license='MIT License',
     author='Microsoft Corporation',
-    author_email='ascl@microsoft.com',
-    url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/table/azure-table',
+    author_email='azpysdkhelp@microsoft.com',
+    url='https://github.com/Azure/azure-sdk-for-python',
     classifiers=[
-        "Development Status :: 4 - Beta",
+        'Development Status :: 4 - Beta',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
@@ -67,18 +74,17 @@
     ],
     zip_safe=False,
     packages=find_packages(exclude=[
+        'tests',
         # Exclude packages that will be covered by PEP420 or nspkg
         'azure',
-        'tests',
+        'azure.data',
     ]),
     install_requires=[
-        "azure-core<2.0.0,>=1.2.2",
-        "msrest>=0.6.10"
-        # azure-data-tables
+        'msrest>=0.5.0',
+        'msrestazure>=0.4.32,<2.0.0',
+        'azure-common~=1.1',
     ],
     extras_require={
-        ":python_version<'3.0'": ['futures'],
-        ":python_version<'3.4'": ['enum34>=1.0.4'],
-        ":python_version<'3.5'": ["typing"]
-    },
+        ":python_version<'3.0'": ['azure-data-nspkg'],
+    }
 )

sdk/tables/azure-data-tables/tests/_shared/testcase.py

@@ -351,6 +351,9 @@ def storage_account():
     i_need_to_create_rg = not (existing_rg_name or existing_storage_name or storage_connection_string)
     got_storage_info_from_env = existing_storage_name or storage_connection_string
 
+    storage_name = None
+    rg_kwargs = {}
+
     try:
         if i_need_to_create_rg:
             rg_name, rg_kwargs = rg_preparer._prepare_create_resource(test_case)
@@ -431,11 +434,12 @@ def build_service_endpoint(service):
             TableTestCase._STORAGE_CONNECTION_STRING = storage_connection_string
             yield
         finally:
-            if not got_storage_info_from_env:
-                storage_preparer.remove_resource(
-                    storage_name,
-                    resource_group=rg
-                )
+            if storage_name is not None:
+                if not got_storage_info_from_env:
+                    storage_preparer.remove_resource(
+                        storage_name,
+                        resource_group=rg
+                    )
     finally:
         if i_need_to_create_rg:
             rg_preparer.remove_resource(rg_name)

sdk/tables/tests.yml

@@ -5,29 +5,12 @@ jobs:
     parameters:
       BuildTargetingString: azure-data-tables
       ServiceDirectory: tables
+      AllocateResourceGroup: 'false'
       EnvVars:
-        STORAGE_ACCOUNT_NAME: $(python-storage-storage-account-name)
-        STORAGE_ACCOUNT_KEY: $(python-storage-storage-account-key)
-        STORAGE_DATA_LAKE_ACCOUNT_NAME: $(python-storage-data-lake-account-name)
-        STORAGE_DATA_LAKE_ACCOUNT_KEY: $(python-storage-data-lake-account-key)
-        BLOB_STORAGE_ACCOUNT_NAME: $(python-storage-blob-storage-account-name)
-        BLOB_STORAGE_ACCOUNT_KEY: $(python-storage-blob-storage-account-key)
-        REMOTE_STORAGE_ACCOUNT_NAME: $(python-storage-remote-storage-account-name)
-        REMOTE_STORAGE_ACCOUNT_KEY: $(python-storage-remote-storage-account-key)
-        PREMIUM_STORAGE_ACCOUNT_NAME: $(python-storage-premium-storage-account-name)
-        PREMIUM_STORAGE_ACCOUNT_KEY: $(python-storage-premium-storage-account-key)
-        OAUTH_STORAGE_ACCOUNT_NAME: $(python-storage-oauth-storage-account-name)
-        OAUTH_STORAGE_ACCOUNT_KEY: $(python-storage-oauth-storage-account-key)
-        ACTIVE_DIRECTORY_APPLICATION_ID: $(aad-azure-sdk-test-client-id)
-        ACTIVE_DIRECTORY_APPLICATION_SECRET: $(aad-azure-sdk-test-client-secret)
-        ACTIVE_DIRECTORY_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
-        CONNECTION_STRING: $(python-storage-blob-connection-string)
-        BLOB_CONNECTION_STRING: $(python-storage-blob-connection-string)
-        PREMIUM_CONNECTION_STRING: $(python-storage-premium-connection-string)
-        TEST_MODE: 'RunLiveNoRecord'
-        AZURE_SKIP_LIVE_RECORDING: 'True'
-        AZURE_TEST_RUN_LIVE: 'true'
         AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
         AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
         AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
+        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
+        TEST_MODE: 'RunLiveNoRecord'
+        AZURE_SKIP_LIVE_RECORDING: 'True'
+        AZURE_TEST_RUN_LIVE: 'true'