diff --git a/doc/sphinx/azhelpgen/doc_source_map.json b/doc/sphinx/azhelpgen/doc_source_map.json index 5dd75f49b..ed6a7888b 100644 --- a/doc/sphinx/azhelpgen/doc_source_map.json +++ b/doc/sphinx/azhelpgen/doc_source_map.json @@ -62,7 +62,7 @@ "servicefabric": "src/command_modules/azure-cli-servicefabric/azure/cli/command_modules/servicefabric/_help.py", "eventhubs": "src/azure-cli/azure/cli/command_modules/eventhubs/_help.py", "servicebus": "src/command_modules/azure-cli-servicebus/azure/cli/command_modules/servicebus/_help.py", - "search": "src/command_modules/azure-cli-search/azure/cli/command_modules/search/_help.py", + "search": "src/azure-cli/azure/cli/command_modules/search/_help.py", "managedapp": "src/azure-cli/azure/cli/command_modules/resource/_help.py", "aks": "src/azure-cli/azure/cli/command_modules/acs/_help.py", "deployment": "src/azure-cli/azure/cli/command_modules/resource/_help.py", diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/__init__.py b/src/azure-cli/azure/cli/command_modules/search/__init__.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/__init__.py rename to src/azure-cli/azure/cli/command_modules/search/__init__.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/_client_factory.py b/src/azure-cli/azure/cli/command_modules/search/_client_factory.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/_client_factory.py rename to src/azure-cli/azure/cli/command_modules/search/_client_factory.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/_help.py b/src/azure-cli/azure/cli/command_modules/search/_help.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/_help.py rename to src/azure-cli/azure/cli/command_modules/search/_help.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/_params.py b/src/azure-cli/azure/cli/command_modules/search/_params.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/_params.py rename to src/azure-cli/azure/cli/command_modules/search/_params.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/commands.py b/src/azure-cli/azure/cli/command_modules/search/commands.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/commands.py rename to src/azure-cli/azure/cli/command_modules/search/commands.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/custom.py b/src/azure-cli/azure/cli/command_modules/search/custom.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/custom.py rename to src/azure-cli/azure/cli/command_modules/search/custom.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/__init__.py b/src/azure-cli/azure/cli/command_modules/search/tests/__init__.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/__init__.py rename to src/azure-cli/azure/cli/command_modules/search/tests/__init__.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/__init__.py b/src/azure-cli/azure/cli/command_modules/search/tests/latest/__init__.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/__init__.py rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/__init__.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_admin_key_show_renew.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_admin_key_show_renew.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_admin_key_show_renew.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_admin_key_show_renew.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_query_key_create_delete_list.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_query_key_create_delete_list.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_query_key_create_delete_list.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_query_key_create_delete_list.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_list.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_list.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_list.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_list.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_show.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_show.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_show.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_delete_show.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_partition.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_partition.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_partition.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_partition.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_replica.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_replica.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_replica.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_multi_replica.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_skus.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_skus.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_skus.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_create_skus.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_update.yaml b/src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_update.yaml similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/recordings/test_service_update.yaml rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/recordings/test_service_update.yaml diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_admin_key.py b/src/azure-cli/azure/cli/command_modules/search/tests/latest/test_admin_key.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_admin_key.py rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/test_admin_key.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_query_key.py b/src/azure-cli/azure/cli/command_modules/search/tests/latest/test_query_key.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_query_key.py rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/test_query_key.py diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_service.py b/src/azure-cli/azure/cli/command_modules/search/tests/latest/test_service.py similarity index 100% rename from src/command_modules/azure-cli-search/azure/cli/command_modules/search/tests/latest/test_service.py rename to src/azure-cli/azure/cli/command_modules/search/tests/latest/test_service.py diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index e736955ba..1c340db3f 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -52,7 +52,6 @@ CLASSIFIERS = [ ] COMMAND_MODULES = [ - 'azure-cli-search', 'azure-cli-security', 'azure-cli-servicebus', 'azure-cli-servicefabric', @@ -117,6 +116,7 @@ DEPENDENCIES = [ 'azure-mgmt-relay~=0.1.0', 'azure-mgmt-reservations~=0.3.1', 'azure-mgmt-resource~=2.1', + 'azure-mgmt-search~=2.0', 'azure-mgmt-sql~=0.12', 'azure-mgmt-storage~=3.3', 'azure-mgmt-trafficmanager~=0.51.0', diff --git a/src/command_modules/azure-cli-search/HISTORY.rst b/src/command_modules/azure-cli-search/HISTORY.rst deleted file mode 100644 index 59b86dee7..000000000 --- a/src/command_modules/azure-cli-search/HISTORY.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. :changelog: - -Release History -=============== - -0.1.1 -+++++ -* Minor fixes - -0.1.0 -+++++ -* Initial release of module. diff --git a/src/command_modules/azure-cli-search/MANIFEST.in b/src/command_modules/azure-cli-search/MANIFEST.in deleted file mode 100644 index f3eb9637a..000000000 --- a/src/command_modules/azure-cli-search/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include *.rst \ No newline at end of file diff --git a/src/command_modules/azure-cli-search/README.rst b/src/command_modules/azure-cli-search/README.rst deleted file mode 100644 index 73da6b20e..000000000 --- a/src/command_modules/azure-cli-search/README.rst +++ /dev/null @@ -1,3 +0,0 @@ -Microsoft Azure CLI 'search' Command Module -=========================================== - diff --git a/src/command_modules/azure-cli-search/azure/__init__.py b/src/command_modules/azure-cli-search/azure/__init__.py deleted file mode 100644 index 73baee1e6..000000000 --- a/src/command_modules/azure-cli-search/azure/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/src/command_modules/azure-cli-search/azure/cli/__init__.py b/src/command_modules/azure-cli-search/azure/cli/__init__.py deleted file mode 100644 index 73baee1e6..000000000 --- a/src/command_modules/azure-cli-search/azure/cli/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/src/command_modules/azure-cli-search/azure/cli/command_modules/__init__.py b/src/command_modules/azure-cli-search/azure/cli/command_modules/__init__.py deleted file mode 100644 index 73baee1e6..000000000 --- a/src/command_modules/azure-cli-search/azure/cli/command_modules/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/src/command_modules/azure-cli-search/azure_bdist_wheel.py b/src/command_modules/azure-cli-search/azure_bdist_wheel.py deleted file mode 100644 index 8a81d1b61..000000000 --- a/src/command_modules/azure-cli-search/azure_bdist_wheel.py +++ /dev/null @@ -1,54 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -#-------------------------------------------------------------------------- - -from distutils import log as logger -import os.path - -from wheel.bdist_wheel import bdist_wheel -class azure_bdist_wheel(bdist_wheel): - """The purpose of this class is to build wheel a little differently than the sdist, - without requiring to build the wheel from the sdist (i.e. you can build the wheel - directly from source). - """ - - description = "Create an Azure wheel distribution" - - user_options = bdist_wheel.user_options + \ - [('azure-namespace-package=', None, - "Name of the deepest nspkg used")] - - def initialize_options(self): - bdist_wheel.initialize_options(self) - self.azure_namespace_package = None - - def finalize_options(self): - bdist_wheel.finalize_options(self) - if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): - raise ValueError("azure_namespace_package must finish by -nspkg") - - def run(self): - if not self.distribution.install_requires: - self.distribution.install_requires = [] - self.distribution.install_requires.append( - "{}>=2.0.0".format(self.azure_namespace_package)) - bdist_wheel.run(self) - - def write_record(self, bdist_dir, distinfo_dir): - if self.azure_namespace_package: - # Split and remove last part, assuming it's "nspkg" - subparts = self.azure_namespace_package.split('-')[0:-1] - folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] - for azure_sub_package in folder_with_init: - init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') - if os.path.isfile(init_file): - logger.info("manually remove {} while building the wheel".format(init_file)) - os.remove(init_file) - else: - raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) - bdist_wheel.write_record(self, bdist_dir, distinfo_dir) -cmdclass = { - 'bdist_wheel': azure_bdist_wheel, -} diff --git a/src/command_modules/azure-cli-search/setup.cfg b/src/command_modules/azure-cli-search/setup.cfg deleted file mode 100644 index 3326c62a7..000000000 --- a/src/command_modules/azure-cli-search/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[bdist_wheel] -universal=1 -azure-namespace-package=azure-cli-command_modules-nspkg diff --git a/src/command_modules/azure-cli-search/setup.py b/src/command_modules/azure-cli-search/setup.py deleted file mode 100644 index a52566b62..000000000 --- a/src/command_modules/azure-cli-search/setup.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -from codecs import open -from setuptools import setup - -try: - from azure_bdist_wheel import cmdclass -except ImportError: - from distutils import log as logger - logger.warn("Wheel is not available, disabling bdist_wheel hook") - cmdclass = {} - -VERSION = "0.1.1" - -# The full list of classifiers is available at -# https://pypi.python.org/pypi?%3Aaction=list_classifiers -CLASSIFIERS = [ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', -] - -DEPENDENCIES = [ - 'azure-cli-core', - 'azure-mgmt-search==2.0.0', -] - -with open('README.rst', 'r', encoding='utf-8') as f: - README = f.read() -with open('HISTORY.rst', 'r', encoding='utf-8') as f: - HISTORY = f.read() - -setup( - name='azure-cli-search', - version=VERSION, - description='Microsoft Azure Command-Line Tools Search Command Module', - long_description=README + '\n\n' + HISTORY, - license='MIT', - author='Microsoft Corporation', - author_email='azpycli@microsoft.com', - url='https://github.com/Azure/azure-cli', - classifiers=CLASSIFIERS, - packages=[ - 'azure', - 'azure.cli', - 'azure.cli.command_modules', - 'azure.cli.command_modules.search', - ], - install_requires=DEPENDENCIES, - cmdclass=cmdclass -)